Skip to content

Commit 38f7425

Browse files
tseavertseaver
committed
Restore unicode literals.
Since we have decided not to support Python 3.2.x, we can avoid the wart.
1 parent 7706cd9 commit 38f7425

5 files changed

Lines changed: 60 additions & 65 deletions

File tree

‎gcloud/datastore/test_connection.py‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import unittest2
2-
import six
32

43

54
class TestConnection(unittest2.TestCase):
@@ -440,7 +439,7 @@ def test_commit_wo_transaction(self):
440439
insert.key.CopyFrom(key_pb)
441440
prop = insert.property.add()
442441
prop.name = 'foo'
443-
prop.value.string_value = six.u('Foo')
442+
prop.value.string_value = u'Foo'
444443
conn = self._makeOne()
445444
URI = '/'.join([
446445
conn.API_BASE_URL,
@@ -482,7 +481,7 @@ def id(self):
482481
insert.key.CopyFrom(key_pb)
483482
prop = insert.property.add()
484483
prop.name = 'foo'
485-
prop.value.string_value = six.u('Foo')
484+
prop.value.string_value = u'Foo'
486485
conn = self._makeOne()
487486
conn.transaction(Xact())
488487
URI = '/'.join([
@@ -644,7 +643,7 @@ def test_save_entity_wo_transaction_w_upsert(self):
644643
'commit',
645644
])
646645
http = conn._http = Http({'status': '200'}, rsp_pb.SerializeToString())
647-
result = conn.save_entity(DATASET_ID, key_pb, {'foo': six.u('Foo')})
646+
result = conn.save_entity(DATASET_ID, key_pb, {'foo': u'Foo'})
648647
self.assertEqual(result, True)
649648
cw = http._called_with
650649
self.assertEqual(cw['uri'], URI)
@@ -665,7 +664,7 @@ def test_save_entity_wo_transaction_w_upsert(self):
665664
props = list(upsert.property)
666665
self.assertEqual(len(props), 1)
667666
self.assertEqual(props[0].name, 'foo')
668-
self.assertEqual(props[0].value.string_value, six.u('Foo'))
667+
self.assertEqual(props[0].value.string_value, u'Foo')
669668
self.assertEqual(props[0].value.indexed, True)
670669
self.assertEqual(len(mutation.delete), 0)
671670
self.assertEqual(request.mode, rq_class.NON_TRANSACTIONAL)
@@ -687,7 +686,7 @@ def test_save_entity_w_exclude_from_indexes(self):
687686
'commit',
688687
])
689688
http = conn._http = Http({'status': '200'}, rsp_pb.SerializeToString())
690-
result = conn.save_entity(DATASET_ID, key_pb, {'foo': six.u('Foo')},
689+
result = conn.save_entity(DATASET_ID, key_pb, {'foo': u'Foo'},
691690
exclude_from_indexes=['foo'])
692691
self.assertEqual(result, True)
693692
cw = http._called_with
@@ -709,7 +708,7 @@ def test_save_entity_w_exclude_from_indexes(self):
709708
props = list(upsert.property)
710709
self.assertEqual(len(props), 1)
711710
self.assertEqual(props[0].name, 'foo')
712-
self.assertEqual(props[0].value.string_value, six.u('Foo'))
711+
self.assertEqual(props[0].value.string_value, u'Foo')
713712
self.assertEqual(props[0].value.indexed, False)
714713
self.assertEqual(len(mutation.delete), 0)
715714
self.assertEqual(request.mode, rq_class.NON_TRANSACTIONAL)
@@ -736,7 +735,7 @@ def test_save_entity_wo_transaction_w_auto_id(self):
736735
'commit',
737736
])
738737
http = conn._http = Http({'status': '200'}, rsp_pb.SerializeToString())
739-
result = conn.save_entity(DATASET_ID, key_pb, {'foo': six.u('Foo')})
738+
result = conn.save_entity(DATASET_ID, key_pb, {'foo': u'Foo'})
740739
self.assertEqual(result, updated_key_pb)
741740
cw = http._called_with
742741
self.assertEqual(cw['uri'], URI)
@@ -755,7 +754,7 @@ def test_save_entity_wo_transaction_w_auto_id(self):
755754
props = list(insert.property)
756755
self.assertEqual(len(props), 1)
757756
self.assertEqual(props[0].name, 'foo')
758-
self.assertEqual(props[0].value.string_value, six.u('Foo'))
757+
self.assertEqual(props[0].value.string_value, u'Foo')
759758
self.assertEqual(len(inserts), 1)
760759
upserts = list(mutation.upsert)
761760
self.assertEqual(len(upserts), 0)
@@ -777,7 +776,7 @@ def mutation(self):
777776
conn = self._makeOne()
778777
conn.transaction(Xact())
779778
http = conn._http = Http({'status': '200'}, rsp_pb.SerializeToString())
780-
result = conn.save_entity(DATASET_ID, key_pb, {'foo': six.u('Foo')})
779+
result = conn.save_entity(DATASET_ID, key_pb, {'foo': u'Foo'})
781780
self.assertEqual(result, True)
782781
self.assertEqual(http._called_with, None)
783782
mutation = conn.mutation()
@@ -795,7 +794,7 @@ def mutation(self):
795794
return mutation
796795
DATASET_ID = 'DATASET'
797796
nested = Entity()
798-
nested['bar'] = six.u('Bar')
797+
nested['bar'] = u'Bar'
799798
key_pb = Key(path=[{'kind': 'Kind', 'id': 1234}]).to_protobuf()
800799
rsp_pb = datastore_pb.CommitResponse()
801800
conn = self._makeOne()

‎gcloud/datastore/test_helpers.py‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import unittest2
2-
import six
32

43

54
class Test_entity_from_protobuf(unittest2.TestCase):
@@ -201,9 +200,9 @@ def test_bytes(self):
201200
self.assertEqual(value, b'bytes')
202201

203202
def test_unicode(self):
204-
name, value = self._callFUT(six.u('str'))
203+
name, value = self._callFUT(u'str')
205204
self.assertEqual(name, 'string_value')
206-
self.assertEqual(value, six.u('str'))
205+
self.assertEqual(value, u'str')
207206

208207
def test_entity(self):
209208
from gcloud.datastore.entity import Entity
@@ -277,8 +276,8 @@ def test_bytes(self):
277276
self.assertEqual(self._callFUT(pb), b'str')
278277

279278
def test_unicode(self):
280-
pb = self._makePB('string_value', six.u('str'))
281-
self.assertEqual(self._callFUT(pb), six.u('str'))
279+
pb = self._makePB('string_value', u'str')
280+
self.assertEqual(self._callFUT(pb), u'str')
282281

283282
def test_entity(self):
284283
from gcloud.datastore.datastore_v1_pb2 import Value
@@ -376,9 +375,9 @@ def test_none(self):
376375
self._callFUT(pb, (1 << 63) - 1)
377376
self._callFUT(pb, 'str')
378377
self._callFUT(pb, b'str')
379-
self._callFUT(pb, six.u('str'))
378+
self._callFUT(pb, u'str')
380379
self._callFUT(pb, entity)
381-
self._callFUT(pb, [six.u('a'), 0, 3.14])
380+
self._callFUT(pb, [u'a', 0, 3.14])
382381

383382
self._callFUT(pb, None)
384383
self.assertEqual(len(pb.ListFields()), 0)
@@ -422,9 +421,9 @@ def test_bytes(self):
422421

423422
def test_unicode(self):
424423
pb = self._makePB()
425-
self._callFUT(pb, six.u('str'))
424+
self._callFUT(pb, u'str')
426425
value = pb.string_value
427-
self.assertEqual(value, six.u('str'))
426+
self.assertEqual(value, u'str')
428427

429428
def test_entity_empty_wo_key(self):
430429
from gcloud.datastore.entity import Entity
@@ -444,18 +443,18 @@ def test_entity_w_key(self):
444443
pb = self._makePB()
445444
key = Key(path=[{'kind': 'KIND', 'id': 123}])
446445
entity = Entity().key(key)
447-
entity['foo'] = six.u('Foo')
446+
entity['foo'] = u'Foo'
448447
self._callFUT(pb, entity)
449448
value = pb.entity_value
450449
self.assertEqual(value.key, key.to_protobuf())
451450
props = list(value.property)
452451
self.assertEqual(len(props), 1)
453452
self.assertEqual(props[0].name, 'foo')
454-
self.assertEqual(props[0].value.string_value, six.u('Foo'))
453+
self.assertEqual(props[0].value.string_value, u'Foo')
455454

456455
def test_list(self):
457456
pb = self._makePB()
458-
values = [six.u('a'), 0, 3.14]
457+
values = [u'a', 0, 3.14]
459458
self._callFUT(pb, values)
460459
marshalled = pb.list_value
461460
self.assertEqual(len(marshalled), len(values))

‎gcloud/datastore/test_query.py‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import unittest2
2-
import six
32

43

54
class TestQuery(unittest2.TestCase):
@@ -76,7 +75,7 @@ def test_filter_w_known_operator(self):
7675
from gcloud.datastore import datastore_v1_pb2 as datastore_pb
7776

7877
query = self._makeOne()
79-
after = query.filter('firstname =', six.u('John'))
78+
after = query.filter('firstname =', u'John')
8079
self.assertFalse(after is query)
8180
self.assertTrue(isinstance(after, self._getTargetClass()))
8281
q_pb = after.to_protobuf()
@@ -85,18 +84,18 @@ def test_filter_w_known_operator(self):
8584
f_pb, = list(q_pb.filter.composite_filter.filter)
8685
p_pb = f_pb.property_filter
8786
self.assertEqual(p_pb.property.name, 'firstname')
88-
self.assertEqual(p_pb.value.string_value, six.u('John'))
87+
self.assertEqual(p_pb.value.string_value, u'John')
8988
self.assertEqual(p_pb.operator, datastore_pb.PropertyFilter.EQUAL)
9089

9190
def test_filter_w_all_operators(self):
9291
from gcloud.datastore import datastore_v1_pb2 as datastore_pb
9392

9493
query = self._makeOne()
95-
query = query.filter('leq_prop <=', six.u('val1'))
96-
query = query.filter('geq_prop >=', six.u('val2'))
97-
query = query.filter('lt_prop <', six.u('val3'))
98-
query = query.filter('gt_prop >', six.u('val4'))
99-
query = query.filter('eq_prop =', six.u('val5'))
94+
query = query.filter('leq_prop <=', u'val1')
95+
query = query.filter('geq_prop >=', u'val2')
96+
query = query.filter('lt_prop <', u'val3')
97+
query = query.filter('gt_prop >', u'val4')
98+
query = query.filter('eq_prop =', u'val5')
10099

101100
query_pb = query.to_protobuf()
102101
pb_values = [
@@ -121,8 +120,8 @@ def test_filter_w_known_operator_and_entity(self):
121120
from gcloud.datastore.entity import Entity
122121
query = self._makeOne()
123122
other = Entity()
124-
other['firstname'] = six.u('John')
125-
other['lastname'] = six.u('Smith')
123+
other['firstname'] = u'John'
124+
other['lastname'] = u'Smith'
126125
after = query.filter('other =', other)
127126
self.assertFalse(after is query)
128127
self.assertTrue(isinstance(after, self._getTargetClass()))
@@ -135,9 +134,9 @@ def test_filter_w_known_operator_and_entity(self):
135134
props = sorted(other_pb.property, key=operator.attrgetter('name'))
136135
self.assertEqual(len(props), 2)
137136
self.assertEqual(props[0].name, 'firstname')
138-
self.assertEqual(props[0].value.string_value, six.u('John'))
137+
self.assertEqual(props[0].value.string_value, u'John')
139138
self.assertEqual(props[1].name, 'lastname')
140-
self.assertEqual(props[1].value.string_value, six.u('Smith'))
139+
self.assertEqual(props[1].value.string_value, u'Smith')
141140

142141
def test_ancestor_w_non_key_non_list(self):
143142
query = self._makeOne()
@@ -147,7 +146,7 @@ def test_ancestor_wo_existing_ancestor_query_w_key_and_propfilter(self):
147146
from gcloud.datastore.key import Key
148147
_KIND = 'KIND'
149148
_ID = 123
150-
_NAME = six.u('NAME')
149+
_NAME = u'NAME'
151150
key = Key(path=[{'kind': _KIND, 'id': _ID}])
152151
query = self._makeOne().filter('name =', _NAME)
153152
after = query.ancestor(key)
@@ -209,7 +208,7 @@ def test_ancestor_clears_existing_ancestor_query_w_only(self):
209208
def test_ancestor_clears_existing_ancestor_query_w_others(self):
210209
_KIND = 'KIND'
211210
_ID = 123
212-
_NAME = six.u('NAME')
211+
_NAME = u'NAME'
213212
query = self._makeOne().filter('name =', _NAME)
214213
between = query.ancestor([_KIND, _ID])
215214
after = between.ancestor(None)
@@ -288,7 +287,7 @@ def test_fetch_default_limit(self):
288287
path_element.id = _ID
289288
prop = entity_pb.property.add()
290289
prop.name = 'foo'
291-
prop.value.string_value = six.u('Foo')
290+
prop.value.string_value = u'Foo'
292291
connection = _Connection(entity_pb)
293292
dataset = _Dataset(_DATASET, connection)
294293
query = self._makeOne(_KIND, dataset)
@@ -316,7 +315,7 @@ def test_fetch_explicit_limit(self):
316315
path_element.id = _ID
317316
prop = entity_pb.property.add()
318317
prop.name = 'foo'
319-
prop.value.string_value = six.u('Foo')
318+
prop.value.string_value = u'Foo'
320319
connection = _Connection(entity_pb)
321320
connection._cursor = _CURSOR
322321
dataset = _Dataset(_DATASET, connection)

‎regression/datastore.py‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
# repository root is the current directory.
88
from regression import populate_datastore
99
from regression import regression_utils
10-
import six
1110

1211

1312
class TestDatastore(unittest2.TestCase):
@@ -46,10 +45,10 @@ class TestDatastoreSave(TestDatastore):
4645

4746
def _get_post(self, name=None, key_id=None, post_content=None):
4847
post_content = post_content or {
49-
'title': six.u('How to make the perfect pizza in your grill'),
50-
'tags': [six.u('pizza'), six.u('grill')],
48+
'title': u'How to make the perfect pizza in your grill',
49+
'tags': [u'pizza', u'grill'],
5150
'publishedAt': datetime.datetime(2001, 1, 1, tzinfo=pytz.utc),
52-
'author': six.u('Silvano'),
51+
'author': u'Silvano',
5352
'isDraft': False,
5453
'wordCount': 400,
5554
'rating': 5.0,
@@ -108,10 +107,10 @@ def test_save_multiple(self):
108107
self.case_entities_to_delete.append(entity1)
109108

110109
second_post_content = {
111-
'title': six.u('How to make the perfect homemade pasta'),
112-
'tags': [six.u('pasta'), six.u('homemade')],
110+
'title': u'How to make the perfect homemade pasta',
111+
'tags': [u'pasta', u'homemade'],
113112
'publishedAt': datetime.datetime(2001, 1, 1),
114-
'author': six.u('Silvano'),
113+
'author': u'Silvano',
115114
'isDraft': False,
116115
'wordCount': 450,
117116
'rating': 4.5,
@@ -135,7 +134,7 @@ class TestDatastoreSaveKeys(TestDatastore):
135134
def test_save_key_self_reference(self):
136135
key = datastore.key.Key.from_path('Person', 'name')
137136
entity = self.dataset.entity(kind=None).key(key)
138-
entity['fullName'] = six.u('Full name')
137+
entity['fullName'] = u'Full name'
139138
entity['linkedTo'] = key # Self reference.
140139

141140
entity.save()
@@ -334,7 +333,7 @@ class TestDatastoreTransaction(TestDatastore):
334333
def test_transaction(self):
335334
key = datastore.key.Key.from_path('Company', 'Google')
336335
entity = self.dataset.entity(kind=None).key(key)
337-
entity['url'] = six.u('www.google.com')
336+
entity['url'] = u'www.google.com'
338337

339338
with self.dataset.transaction():
340339
retrieved_entity = self.dataset.get_entity(key)

‎regression/populate_datastore.py‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"""Script to populate datastore with regression test data."""
22
from __future__ import print_function
33

4-
import six
54
from six.moves import zip
65

76
from gcloud import datastore
@@ -31,43 +30,43 @@
3130
]
3231
CHARACTERS = [
3332
{
34-
'name': six.u('Rickard'),
35-
'family': six.u('Stark'),
33+
'name': u'Rickard',
34+
'family': u'Stark',
3635
'appearances': 0,
3736
'alive': False,
3837
}, {
39-
'name': six.u('Eddard'),
40-
'family': six.u('Stark'),
38+
'name': u'Eddard',
39+
'family': u'Stark',
4140
'appearances': 9,
4241
'alive': False,
4342
}, {
44-
'name': six.u('Catelyn'),
45-
'family': [six.u('Stark'), six.u('Tully')],
43+
'name': u'Catelyn',
44+
'family': [u'Stark', u'Tully'],
4645
'appearances': 26,
4746
'alive': False,
4847
}, {
49-
'name': six.u('Arya'),
50-
'family': six.u('Stark'),
48+
'name': u'Arya',
49+
'family': u'Stark',
5150
'appearances': 33,
5251
'alive': True,
5352
}, {
54-
'name': six.u('Sansa'),
55-
'family': six.u('Stark'),
53+
'name': u'Sansa',
54+
'family': u'Stark',
5655
'appearances': 31,
5756
'alive': True,
5857
}, {
59-
'name': six.u('Robb'),
60-
'family': six.u('Stark'),
58+
'name': u'Robb',
59+
'family': u'Stark',
6160
'appearances': 22,
6261
'alive': False,
6362
}, {
64-
'name': six.u('Bran'),
65-
'family': six.u('Stark'),
63+
'name': u'Bran',
64+
'family': u'Stark',
6665
'appearances': 25,
6766
'alive': True,
6867
}, {
69-
'name': six.u('Jon Snow'),
70-
'family': six.u('Stark'),
68+
'name': u'Jon Snow',
69+
'family': u'Stark',
7170
'appearances': 32,
7271
'alive': True,
7372
},

0 commit comments

Comments
 (0)