Skip to content

Commit b3c8a48

Browse files
dhermesdhermes
committed
Updating datastore imports grpc->proto.
Done via: $ cd datastore/ $ git grep -l '\.grpc\.' | xargs sed -i s/'\.grpc\.'/'\.proto\.'/g
1 parent dea462f commit b3c8a48

File tree

14 files changed

+94
-94
lines changed

14 files changed

+94
-94
lines changed

‎datastore/google/cloud/datastore/_gax.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from google.cloud._helpers import make_secure_stub
2424
from google.cloud import exceptions
2525

26-
from google.cloud.grpc.datastore.v1 import datastore_pb2_grpc
26+
from google.cloud.proto.datastore.v1 import datastore_pb2_grpc
2727

2828

2929
_GRPC_ERROR_MAPPING = {

‎datastore/google/cloud/datastore/_http.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from google.cloud.environment_vars import DISABLE_GRPC
2323
from google.cloud.environment_vars import GCD_HOST
2424
from google.cloud import exceptions
25-
from google.cloud.grpc.datastore.v1 import datastore_pb2 as _datastore_pb2
25+
from google.cloud.proto.datastore.v1 import datastore_pb2 as _datastore_pb2
2626

2727
from google.cloud.datastore import __version__
2828
try:

‎datastore/google/cloud/datastore/batch.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"""
2323

2424
from google.cloud.datastore import helpers
25-
from google.cloud.grpc.datastore.v1 import datastore_pb2 as _datastore_pb2
25+
from google.cloud.proto.datastore.v1 import datastore_pb2 as _datastore_pb2
2626

2727

2828
class Batch(object):

‎datastore/google/cloud/datastore/helpers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
from google.cloud._helpers import _datetime_to_pb_timestamp
2828
from google.cloud._helpers import _pb_timestamp_to_datetime
29-
from google.cloud.grpc.datastore.v1 import entity_pb2 as _entity_pb2
29+
from google.cloud.proto.datastore.v1 import entity_pb2 as _entity_pb2
3030
from google.cloud.datastore.entity import Entity
3131
from google.cloud.datastore.key import Key
3232

‎datastore/google/cloud/datastore/key.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import copy
1818
import six
1919

20-
from google.cloud.grpc.datastore.v1 import entity_pb2 as _entity_pb2
20+
from google.cloud.proto.datastore.v1 import entity_pb2 as _entity_pb2
2121

2222

2323
class Key(object):

‎datastore/google/cloud/datastore/query.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from google.cloud.iterator import Iterator as BaseIterator
2121
from google.cloud.iterator import Page
2222

23-
from google.cloud.grpc.datastore.v1 import query_pb2 as _query_pb2
23+
from google.cloud.proto.datastore.v1 import query_pb2 as _query_pb2
2424
from google.cloud.datastore import helpers
2525
from google.cloud.datastore.key import Key
2626

‎datastore/unit_tests/test__gax.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def mock_make_stub(*args):
126126
return self._get_target_class()(connection, secure)
127127

128128
def test_constructor(self):
129-
from google.cloud.grpc.datastore.v1 import datastore_pb2_grpc
129+
from google.cloud.proto.datastore.v1 import datastore_pb2_grpc
130130

131131
conn = mock.Mock(
132132
credentials=object(),
@@ -149,7 +149,7 @@ def test_constructor(self):
149149
)])
150150

151151
def test_constructor_insecure(self):
152-
from google.cloud.grpc.datastore.v1 import datastore_pb2_grpc
152+
from google.cloud.proto.datastore.v1 import datastore_pb2_grpc
153153

154154
conn = mock.Mock(
155155
credentials=object(),

‎datastore/unit_tests/test__http.py‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def _make_key_pb(self, project, id_=1234):
139139
return Key(*path_args, project=project).to_protobuf()
140140

141141
def _make_query_pb(self, kind):
142-
from google.cloud.grpc.datastore.v1 import query_pb2
142+
from google.cloud.proto.datastore.v1 import query_pb2
143143

144144
pb = query_pb2.Query()
145145
pb.kind.add().name = kind
@@ -253,7 +253,7 @@ def test_build_api_url_w_explicit_base_version(self):
253253
URI)
254254

255255
def test_lookup_single_key_empty_response(self):
256-
from google.cloud.grpc.datastore.v1 import datastore_pb2
256+
from google.cloud.proto.datastore.v1 import datastore_pb2
257257

258258
PROJECT = 'PROJECT'
259259
key_pb = self._make_key_pb(PROJECT)
@@ -281,7 +281,7 @@ def test_lookup_single_key_empty_response(self):
281281
self.assertEqual(key_pb, keys[0])
282282

283283
def test_lookup_single_key_empty_response_w_eventual(self):
284-
from google.cloud.grpc.datastore.v1 import datastore_pb2
284+
from google.cloud.proto.datastore.v1 import datastore_pb2
285285

286286
PROJECT = 'PROJECT'
287287
key_pb = self._make_key_pb(PROJECT)
@@ -321,7 +321,7 @@ def test_lookup_single_key_empty_response_w_eventual_and_transaction(self):
321321
eventual=True, transaction_id=TRANSACTION)
322322

323323
def test_lookup_single_key_empty_response_w_transaction(self):
324-
from google.cloud.grpc.datastore.v1 import datastore_pb2
324+
from google.cloud.proto.datastore.v1 import datastore_pb2
325325

326326
PROJECT = 'PROJECT'
327327
TRANSACTION = b'TRANSACTION'
@@ -352,8 +352,8 @@ def test_lookup_single_key_empty_response_w_transaction(self):
352352
self.assertEqual(request.read_options.transaction, TRANSACTION)
353353

354354
def test_lookup_single_key_nonempty_response(self):
355-
from google.cloud.grpc.datastore.v1 import datastore_pb2
356-
from google.cloud.grpc.datastore.v1 import entity_pb2
355+
from google.cloud.proto.datastore.v1 import datastore_pb2
356+
from google.cloud.proto.datastore.v1 import entity_pb2
357357

358358
PROJECT = 'PROJECT'
359359
key_pb = self._make_key_pb(PROJECT)
@@ -385,7 +385,7 @@ def test_lookup_single_key_nonempty_response(self):
385385
self.assertEqual(key_pb, keys[0])
386386

387387
def test_lookup_multiple_keys_empty_response(self):
388-
from google.cloud.grpc.datastore.v1 import datastore_pb2
388+
from google.cloud.proto.datastore.v1 import datastore_pb2
389389

390390
PROJECT = 'PROJECT'
391391
key_pb1 = self._make_key_pb(PROJECT)
@@ -415,7 +415,7 @@ def test_lookup_multiple_keys_empty_response(self):
415415
self.assertEqual(key_pb2, keys[1])
416416

417417
def test_lookup_multiple_keys_w_missing(self):
418-
from google.cloud.grpc.datastore.v1 import datastore_pb2
418+
from google.cloud.proto.datastore.v1 import datastore_pb2
419419

420420
PROJECT = 'PROJECT'
421421
key_pb1 = self._make_key_pb(PROJECT)
@@ -450,7 +450,7 @@ def test_lookup_multiple_keys_w_missing(self):
450450
self.assertEqual(key_pb2, keys[1])
451451

452452
def test_lookup_multiple_keys_w_deferred(self):
453-
from google.cloud.grpc.datastore.v1 import datastore_pb2
453+
from google.cloud.proto.datastore.v1 import datastore_pb2
454454

455455
from google.cloud import _http as connection_module
456456
from google.cloud.datastore._http import _CLIENT_INFO
@@ -494,8 +494,8 @@ def test_lookup_multiple_keys_w_deferred(self):
494494
self.assertEqual(key_pb2, keys[1])
495495

496496
def test_run_query_w_eventual_no_transaction(self):
497-
from google.cloud.grpc.datastore.v1 import datastore_pb2
498-
from google.cloud.grpc.datastore.v1 import query_pb2
497+
from google.cloud.proto.datastore.v1 import datastore_pb2
498+
from google.cloud.proto.datastore.v1 import query_pb2
499499

500500
project = 'PROJECT'
501501
kind = 'Nonesuch'
@@ -534,8 +534,8 @@ def test_run_query_w_eventual_no_transaction(self):
534534
self.assertEqual(request.read_options.transaction, b'')
535535

536536
def test_run_query_wo_eventual_w_transaction(self):
537-
from google.cloud.grpc.datastore.v1 import datastore_pb2
538-
from google.cloud.grpc.datastore.v1 import query_pb2
537+
from google.cloud.proto.datastore.v1 import datastore_pb2
538+
from google.cloud.proto.datastore.v1 import query_pb2
539539

540540
project = 'PROJECT'
541541
kind = 'Nonesuch'
@@ -577,8 +577,8 @@ def test_run_query_wo_eventual_w_transaction(self):
577577
self.assertEqual(request.read_options.transaction, transaction)
578578

579579
def test_run_query_w_eventual_and_transaction(self):
580-
from google.cloud.grpc.datastore.v1 import datastore_pb2
581-
from google.cloud.grpc.datastore.v1 import query_pb2
580+
from google.cloud.proto.datastore.v1 import datastore_pb2
581+
from google.cloud.proto.datastore.v1 import query_pb2
582582

583583
PROJECT = 'PROJECT'
584584
KIND = 'Nonesuch'
@@ -595,8 +595,8 @@ def test_run_query_w_eventual_and_transaction(self):
595595
eventual=True, transaction_id=TRANSACTION)
596596

597597
def test_run_query_wo_namespace_empty_result(self):
598-
from google.cloud.grpc.datastore.v1 import datastore_pb2
599-
from google.cloud.grpc.datastore.v1 import query_pb2
598+
from google.cloud.proto.datastore.v1 import datastore_pb2
599+
from google.cloud.proto.datastore.v1 import query_pb2
600600

601601
project = 'PROJECT'
602602
kind = 'Nonesuch'
@@ -632,9 +632,9 @@ def test_run_query_wo_namespace_empty_result(self):
632632
self.assertEqual(request.query, q_pb)
633633

634634
def test_run_query_w_namespace_nonempty_result(self):
635-
from google.cloud.grpc.datastore.v1 import datastore_pb2
636-
from google.cloud.grpc.datastore.v1 import entity_pb2
637-
from google.cloud.grpc.datastore.v1 import query_pb2
635+
from google.cloud.proto.datastore.v1 import datastore_pb2
636+
from google.cloud.proto.datastore.v1 import entity_pb2
637+
from google.cloud.proto.datastore.v1 import query_pb2
638638

639639
project = 'PROJECT'
640640
kind = 'Kind'
@@ -670,7 +670,7 @@ def test_run_query_w_namespace_nonempty_result(self):
670670
self.assertEqual(request.query, q_pb)
671671

672672
def test_begin_transaction(self):
673-
from google.cloud.grpc.datastore.v1 import datastore_pb2
673+
from google.cloud.proto.datastore.v1 import datastore_pb2
674674

675675
PROJECT = 'PROJECT'
676676
TRANSACTION = b'TRANSACTION'
@@ -693,7 +693,7 @@ def test_begin_transaction(self):
693693
request.ParseFromString(cw['body'])
694694

695695
def test_commit_wo_transaction(self):
696-
from google.cloud.grpc.datastore.v1 import datastore_pb2
696+
from google.cloud.proto.datastore.v1 import datastore_pb2
697697
from google.cloud.datastore.helpers import _new_value_pb
698698

699699
project = 'PROJECT'
@@ -729,7 +729,7 @@ def test_commit_wo_transaction(self):
729729
self.assertEqual(request.mode, rq_class.NON_TRANSACTIONAL)
730730

731731
def test_commit_w_transaction(self):
732-
from google.cloud.grpc.datastore.v1 import datastore_pb2
732+
from google.cloud.proto.datastore.v1 import datastore_pb2
733733
from google.cloud.datastore.helpers import _new_value_pb
734734

735735
project = 'PROJECT'
@@ -765,7 +765,7 @@ def test_commit_w_transaction(self):
765765
self.assertEqual(request.mode, rq_class.TRANSACTIONAL)
766766

767767
def test_rollback_ok(self):
768-
from google.cloud.grpc.datastore.v1 import datastore_pb2
768+
from google.cloud.proto.datastore.v1 import datastore_pb2
769769

770770
PROJECT = 'PROJECT'
771771
TRANSACTION = b'xact'
@@ -789,7 +789,7 @@ def test_rollback_ok(self):
789789
self.assertEqual(request.transaction, TRANSACTION)
790790

791791
def test_allocate_ids_empty(self):
792-
from google.cloud.grpc.datastore.v1 import datastore_pb2
792+
from google.cloud.proto.datastore.v1 import datastore_pb2
793793

794794
PROJECT = 'PROJECT'
795795
rsp_pb = datastore_pb2.AllocateIdsResponse()
@@ -811,7 +811,7 @@ def test_allocate_ids_empty(self):
811811
self.assertEqual(list(request.keys), [])
812812

813813
def test_allocate_ids_non_empty(self):
814-
from google.cloud.grpc.datastore.v1 import datastore_pb2
814+
from google.cloud.proto.datastore.v1 import datastore_pb2
815815

816816
PROJECT = 'PROJECT'
817817
before_key_pbs = [

‎datastore/unit_tests/test_batch.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def _make_one(self, client):
2727
return self._get_target_class()(client)
2828

2929
def test_ctor(self):
30-
from google.cloud.grpc.datastore.v1 import datastore_pb2
30+
from google.cloud.proto.datastore.v1 import datastore_pb2
3131

3232
_PROJECT = 'PROJECT'
3333
_NAMESPACE = 'NAMESPACE'
@@ -377,8 +377,8 @@ def _call_fut(self, commit_response_pb):
377377
return _parse_commit_response(commit_response_pb)
378378

379379
def test_it(self):
380-
from google.cloud.grpc.datastore.v1 import datastore_pb2
381-
from google.cloud.grpc.datastore.v1 import entity_pb2
380+
from google.cloud.proto.datastore.v1 import datastore_pb2
381+
from google.cloud.proto.datastore.v1 import entity_pb2
382382

383383
index_updates = 1337
384384
keys = [
@@ -414,7 +414,7 @@ class _Connection(object):
414414
_save_result = (False, None)
415415

416416
def __init__(self, *new_key_ids):
417-
from google.cloud.grpc.datastore.v1 import datastore_pb2
417+
from google.cloud.proto.datastore.v1 import datastore_pb2
418418

419419
self._committed = []
420420
mutation_results = [
@@ -449,7 +449,7 @@ def is_partial(self):
449449
return self._id is None
450450

451451
def to_protobuf(self):
452-
from google.cloud.grpc.datastore.v1 import entity_pb2
452+
from google.cloud.proto.datastore.v1 import entity_pb2
453453

454454
key = self._key = entity_pb2.Key()
455455
# Don't assign it, because it will just get ripped out
@@ -507,8 +507,8 @@ def _mutated_pb(test_case, mutation_pb_list, mutation_type):
507507

508508

509509
def _make_mutation(id_):
510-
from google.cloud.grpc.datastore.v1 import datastore_pb2
511-
from google.cloud.grpc.datastore.v1 import entity_pb2
510+
from google.cloud.proto.datastore.v1 import datastore_pb2
511+
from google.cloud.proto.datastore.v1 import entity_pb2
512512

513513
key = entity_pb2.Key()
514514
key.partition_id.project_id = 'PROJECT'

‎datastore/unit_tests/test_client.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def _make_credentials():
2424

2525

2626
def _make_entity_pb(project, kind, integer_id, name=None, str_val=None):
27-
from google.cloud.grpc.datastore.v1 import entity_pb2
27+
from google.cloud.proto.datastore.v1 import entity_pb2
2828
from google.cloud.datastore.helpers import _new_value_pb
2929

3030
entity_pb = entity_pb2.Entity()
@@ -280,7 +280,7 @@ def test_get_multi_miss(self):
280280
self.assertEqual(results, [])
281281

282282
def test_get_multi_miss_w_missing(self):
283-
from google.cloud.grpc.datastore.v1 import entity_pb2
283+
from google.cloud.proto.datastore.v1 import entity_pb2
284284
from google.cloud.datastore.key import Key
285285

286286
KIND = 'Kind'
@@ -344,7 +344,7 @@ def test_get_multi_miss_w_deferred(self):
344344
[key.to_protobuf()])
345345

346346
def test_get_multi_w_deferred_from_backend_but_not_passed(self):
347-
from google.cloud.grpc.datastore.v1 import entity_pb2
347+
from google.cloud.proto.datastore.v1 import entity_pb2
348348
from google.cloud.datastore.entity import Entity
349349
from google.cloud.datastore.key import Key
350350

@@ -943,7 +943,7 @@ def lookup(self, project, key_pbs, eventual=False, transaction_id=None):
943943
return results, missing, deferred
944944

945945
def commit(self, project, commit_request, transaction_id):
946-
from google.cloud.grpc.datastore.v1 import datastore_pb2
946+
from google.cloud.proto.datastore.v1 import datastore_pb2
947947

948948
self._commit_cw.append((project, commit_request, transaction_id))
949949
keys, self._commit = self._commit[0], self._commit[1:]
@@ -1015,7 +1015,7 @@ def is_partial(self):
10151015
return self._id is None
10161016

10171017
def to_protobuf(self):
1018-
from google.cloud.grpc.datastore.v1 import entity_pb2
1018+
from google.cloud.proto.datastore.v1 import entity_pb2
10191019

10201020
key = self._key = entity_pb2.Key()
10211021
# Don't assign it, because it will just get ripped out
@@ -1065,7 +1065,7 @@ def _mutated_pb(test_case, mutation_pb_list, mutation_type):
10651065

10661066

10671067
def _make_key(id_):
1068-
from google.cloud.grpc.datastore.v1 import entity_pb2
1068+
from google.cloud.proto.datastore.v1 import entity_pb2
10691069

10701070
key = entity_pb2.Key()
10711071
elem = key.path.add()

0 commit comments

Comments
 (0)