Updating datastore imports grpc->proto.

Done via:

$ cd datastore/
$ git grep -l '\.grpc\.' | xargs sed -i s/'\.grpc\.'/'\.proto\.'/g

datastore/google/cloud/datastore/_gax.py

@@ -23,7 +23,7 @@
 from google.cloud._helpers import make_secure_stub
 from google.cloud import exceptions
 
-from google.cloud.grpc.datastore.v1 import datastore_pb2_grpc
+from google.cloud.proto.datastore.v1 import datastore_pb2_grpc
 
 
 _GRPC_ERROR_MAPPING = {

datastore/google/cloud/datastore/_http.py

@@ -22,7 +22,7 @@
 from google.cloud.environment_vars import DISABLE_GRPC
 from google.cloud.environment_vars import GCD_HOST
 from google.cloud import exceptions
-from google.cloud.grpc.datastore.v1 import datastore_pb2 as _datastore_pb2
+from google.cloud.proto.datastore.v1 import datastore_pb2 as _datastore_pb2
 
 from google.cloud.datastore import __version__
 try:

datastore/google/cloud/datastore/batch.py

@@ -22,7 +22,7 @@
 """
 
 from google.cloud.datastore import helpers
-from google.cloud.grpc.datastore.v1 import datastore_pb2 as _datastore_pb2
+from google.cloud.proto.datastore.v1 import datastore_pb2 as _datastore_pb2
 
 
 class Batch(object):

datastore/google/cloud/datastore/helpers.py

@@ -26,7 +26,7 @@
 
 from google.cloud._helpers import _datetime_to_pb_timestamp
 from google.cloud._helpers import _pb_timestamp_to_datetime
-from google.cloud.grpc.datastore.v1 import entity_pb2 as _entity_pb2
+from google.cloud.proto.datastore.v1 import entity_pb2 as _entity_pb2
 from google.cloud.datastore.entity import Entity
 from google.cloud.datastore.key import Key
 

datastore/google/cloud/datastore/key.py

@@ -17,7 +17,7 @@
 import copy
 import six
 
-from google.cloud.grpc.datastore.v1 import entity_pb2 as _entity_pb2
+from google.cloud.proto.datastore.v1 import entity_pb2 as _entity_pb2
 
 
 class Key(object):

datastore/google/cloud/datastore/query.py

@@ -20,7 +20,7 @@
 from google.cloud.iterator import Iterator as BaseIterator
 from google.cloud.iterator import Page
 
-from google.cloud.grpc.datastore.v1 import query_pb2 as _query_pb2
+from google.cloud.proto.datastore.v1 import query_pb2 as _query_pb2
 from google.cloud.datastore import helpers
 from google.cloud.datastore.key import Key
 

datastore/unit_tests/test__gax.py

@@ -126,7 +126,7 @@ def mock_make_stub(*args):
             return self._get_target_class()(connection, secure)
 
     def test_constructor(self):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2_grpc
+        from google.cloud.proto.datastore.v1 import datastore_pb2_grpc
 
         conn = mock.Mock(
             credentials=object(),
@@ -149,7 +149,7 @@ def test_constructor(self):
         )])
 
     def test_constructor_insecure(self):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2_grpc
+        from google.cloud.proto.datastore.v1 import datastore_pb2_grpc
 
         conn = mock.Mock(
             credentials=object(),

datastore/unit_tests/test__http.py

@@ -139,7 +139,7 @@ def _make_key_pb(self, project, id_=1234):
         return Key(*path_args, project=project).to_protobuf()
 
     def _make_query_pb(self, kind):
-        from google.cloud.grpc.datastore.v1 import query_pb2
+        from google.cloud.proto.datastore.v1 import query_pb2
 
         pb = query_pb2.Query()
         pb.kind.add().name = kind
@@ -253,7 +253,7 @@ def test_build_api_url_w_explicit_base_version(self):
                          URI)
 
     def test_lookup_single_key_empty_response(self):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2
+        from google.cloud.proto.datastore.v1 import datastore_pb2
 
         PROJECT = 'PROJECT'
         key_pb = self._make_key_pb(PROJECT)
@@ -281,7 +281,7 @@ def test_lookup_single_key_empty_response(self):
         self.assertEqual(key_pb, keys[0])
 
     def test_lookup_single_key_empty_response_w_eventual(self):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2
+        from google.cloud.proto.datastore.v1 import datastore_pb2
 
         PROJECT = 'PROJECT'
         key_pb = self._make_key_pb(PROJECT)
@@ -321,7 +321,7 @@ def test_lookup_single_key_empty_response_w_eventual_and_transaction(self):
                           eventual=True, transaction_id=TRANSACTION)
 
     def test_lookup_single_key_empty_response_w_transaction(self):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2
+        from google.cloud.proto.datastore.v1 import datastore_pb2
 
         PROJECT = 'PROJECT'
         TRANSACTION = b'TRANSACTION'
@@ -352,8 +352,8 @@ def test_lookup_single_key_empty_response_w_transaction(self):
         self.assertEqual(request.read_options.transaction, TRANSACTION)
 
     def test_lookup_single_key_nonempty_response(self):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2
-        from google.cloud.grpc.datastore.v1 import entity_pb2
+        from google.cloud.proto.datastore.v1 import datastore_pb2
+        from google.cloud.proto.datastore.v1 import entity_pb2
 
         PROJECT = 'PROJECT'
         key_pb = self._make_key_pb(PROJECT)
@@ -385,7 +385,7 @@ def test_lookup_single_key_nonempty_response(self):
         self.assertEqual(key_pb, keys[0])
 
     def test_lookup_multiple_keys_empty_response(self):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2
+        from google.cloud.proto.datastore.v1 import datastore_pb2
 
         PROJECT = 'PROJECT'
         key_pb1 = self._make_key_pb(PROJECT)
@@ -415,7 +415,7 @@ def test_lookup_multiple_keys_empty_response(self):
         self.assertEqual(key_pb2, keys[1])
 
     def test_lookup_multiple_keys_w_missing(self):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2
+        from google.cloud.proto.datastore.v1 import datastore_pb2
 
         PROJECT = 'PROJECT'
         key_pb1 = self._make_key_pb(PROJECT)
@@ -450,7 +450,7 @@ def test_lookup_multiple_keys_w_missing(self):
         self.assertEqual(key_pb2, keys[1])
 
     def test_lookup_multiple_keys_w_deferred(self):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2
+        from google.cloud.proto.datastore.v1 import datastore_pb2
 
         from google.cloud import _http as connection_module
         from google.cloud.datastore._http import _CLIENT_INFO
@@ -494,8 +494,8 @@ def test_lookup_multiple_keys_w_deferred(self):
         self.assertEqual(key_pb2, keys[1])
 
     def test_run_query_w_eventual_no_transaction(self):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2
-        from google.cloud.grpc.datastore.v1 import query_pb2
+        from google.cloud.proto.datastore.v1 import datastore_pb2
+        from google.cloud.proto.datastore.v1 import query_pb2
 
         project = 'PROJECT'
         kind = 'Nonesuch'
@@ -534,8 +534,8 @@ def test_run_query_w_eventual_no_transaction(self):
         self.assertEqual(request.read_options.transaction, b'')
 
     def test_run_query_wo_eventual_w_transaction(self):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2
-        from google.cloud.grpc.datastore.v1 import query_pb2
+        from google.cloud.proto.datastore.v1 import datastore_pb2
+        from google.cloud.proto.datastore.v1 import query_pb2
 
         project = 'PROJECT'
         kind = 'Nonesuch'
@@ -577,8 +577,8 @@ def test_run_query_wo_eventual_w_transaction(self):
         self.assertEqual(request.read_options.transaction, transaction)
 
     def test_run_query_w_eventual_and_transaction(self):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2
-        from google.cloud.grpc.datastore.v1 import query_pb2
+        from google.cloud.proto.datastore.v1 import datastore_pb2
+        from google.cloud.proto.datastore.v1 import query_pb2
 
         PROJECT = 'PROJECT'
         KIND = 'Nonesuch'
@@ -595,8 +595,8 @@ def test_run_query_w_eventual_and_transaction(self):
                           eventual=True, transaction_id=TRANSACTION)
 
     def test_run_query_wo_namespace_empty_result(self):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2
-        from google.cloud.grpc.datastore.v1 import query_pb2
+        from google.cloud.proto.datastore.v1 import datastore_pb2
+        from google.cloud.proto.datastore.v1 import query_pb2
 
         project = 'PROJECT'
         kind = 'Nonesuch'
@@ -632,9 +632,9 @@ def test_run_query_wo_namespace_empty_result(self):
         self.assertEqual(request.query, q_pb)
 
     def test_run_query_w_namespace_nonempty_result(self):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2
-        from google.cloud.grpc.datastore.v1 import entity_pb2
-        from google.cloud.grpc.datastore.v1 import query_pb2
+        from google.cloud.proto.datastore.v1 import datastore_pb2
+        from google.cloud.proto.datastore.v1 import entity_pb2
+        from google.cloud.proto.datastore.v1 import query_pb2
 
         project = 'PROJECT'
         kind = 'Kind'
@@ -670,7 +670,7 @@ def test_run_query_w_namespace_nonempty_result(self):
         self.assertEqual(request.query, q_pb)
 
     def test_begin_transaction(self):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2
+        from google.cloud.proto.datastore.v1 import datastore_pb2
 
         PROJECT = 'PROJECT'
         TRANSACTION = b'TRANSACTION'
@@ -693,7 +693,7 @@ def test_begin_transaction(self):
         request.ParseFromString(cw['body'])
 
     def test_commit_wo_transaction(self):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2
+        from google.cloud.proto.datastore.v1 import datastore_pb2
         from google.cloud.datastore.helpers import _new_value_pb
 
         project = 'PROJECT'
@@ -729,7 +729,7 @@ def test_commit_wo_transaction(self):
         self.assertEqual(request.mode, rq_class.NON_TRANSACTIONAL)
 
     def test_commit_w_transaction(self):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2
+        from google.cloud.proto.datastore.v1 import datastore_pb2
         from google.cloud.datastore.helpers import _new_value_pb
 
         project = 'PROJECT'
@@ -765,7 +765,7 @@ def test_commit_w_transaction(self):
         self.assertEqual(request.mode, rq_class.TRANSACTIONAL)
 
     def test_rollback_ok(self):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2
+        from google.cloud.proto.datastore.v1 import datastore_pb2
 
         PROJECT = 'PROJECT'
         TRANSACTION = b'xact'
@@ -789,7 +789,7 @@ def test_rollback_ok(self):
         self.assertEqual(request.transaction, TRANSACTION)
 
     def test_allocate_ids_empty(self):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2
+        from google.cloud.proto.datastore.v1 import datastore_pb2
 
         PROJECT = 'PROJECT'
         rsp_pb = datastore_pb2.AllocateIdsResponse()
@@ -811,7 +811,7 @@ def test_allocate_ids_empty(self):
         self.assertEqual(list(request.keys), [])
 
     def test_allocate_ids_non_empty(self):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2
+        from google.cloud.proto.datastore.v1 import datastore_pb2
 
         PROJECT = 'PROJECT'
         before_key_pbs = [

datastore/unit_tests/test_batch.py

@@ -27,7 +27,7 @@ def _make_one(self, client):
         return self._get_target_class()(client)
 
     def test_ctor(self):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2
+        from google.cloud.proto.datastore.v1 import datastore_pb2
 
         _PROJECT = 'PROJECT'
         _NAMESPACE = 'NAMESPACE'
@@ -377,8 +377,8 @@ def _call_fut(self, commit_response_pb):
         return _parse_commit_response(commit_response_pb)
 
     def test_it(self):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2
-        from google.cloud.grpc.datastore.v1 import entity_pb2
+        from google.cloud.proto.datastore.v1 import datastore_pb2
+        from google.cloud.proto.datastore.v1 import entity_pb2
 
         index_updates = 1337
         keys = [
@@ -414,7 +414,7 @@ class _Connection(object):
     _save_result = (False, None)
 
     def __init__(self, *new_key_ids):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2
+        from google.cloud.proto.datastore.v1 import datastore_pb2
 
         self._committed = []
         mutation_results = [
@@ -449,7 +449,7 @@ def is_partial(self):
         return self._id is None
 
     def to_protobuf(self):
-        from google.cloud.grpc.datastore.v1 import entity_pb2
+        from google.cloud.proto.datastore.v1 import entity_pb2
 
         key = self._key = entity_pb2.Key()
         # 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):
 
 
 def _make_mutation(id_):
-    from google.cloud.grpc.datastore.v1 import datastore_pb2
-    from google.cloud.grpc.datastore.v1 import entity_pb2
+    from google.cloud.proto.datastore.v1 import datastore_pb2
+    from google.cloud.proto.datastore.v1 import entity_pb2
 
     key = entity_pb2.Key()
     key.partition_id.project_id = 'PROJECT'

datastore/unit_tests/test_client.py

@@ -24,7 +24,7 @@ def _make_credentials():
 
 
 def _make_entity_pb(project, kind, integer_id, name=None, str_val=None):
-    from google.cloud.grpc.datastore.v1 import entity_pb2
+    from google.cloud.proto.datastore.v1 import entity_pb2
     from google.cloud.datastore.helpers import _new_value_pb
 
     entity_pb = entity_pb2.Entity()
@@ -280,7 +280,7 @@ def test_get_multi_miss(self):
         self.assertEqual(results, [])
 
     def test_get_multi_miss_w_missing(self):
-        from google.cloud.grpc.datastore.v1 import entity_pb2
+        from google.cloud.proto.datastore.v1 import entity_pb2
         from google.cloud.datastore.key import Key
 
         KIND = 'Kind'
@@ -344,7 +344,7 @@ def test_get_multi_miss_w_deferred(self):
                          [key.to_protobuf()])
 
     def test_get_multi_w_deferred_from_backend_but_not_passed(self):
-        from google.cloud.grpc.datastore.v1 import entity_pb2
+        from google.cloud.proto.datastore.v1 import entity_pb2
         from google.cloud.datastore.entity import Entity
         from google.cloud.datastore.key import Key
 
@@ -943,7 +943,7 @@ def lookup(self, project, key_pbs, eventual=False, transaction_id=None):
         return results, missing, deferred
 
     def commit(self, project, commit_request, transaction_id):
-        from google.cloud.grpc.datastore.v1 import datastore_pb2
+        from google.cloud.proto.datastore.v1 import datastore_pb2
 
         self._commit_cw.append((project, commit_request, transaction_id))
         keys, self._commit = self._commit[0], self._commit[1:]
@@ -1015,7 +1015,7 @@ def is_partial(self):
         return self._id is None
 
     def to_protobuf(self):
-        from google.cloud.grpc.datastore.v1 import entity_pb2
+        from google.cloud.proto.datastore.v1 import entity_pb2
 
         key = self._key = entity_pb2.Key()
         # 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):
 
 
 def _make_key(id_):
-    from google.cloud.grpc.datastore.v1 import entity_pb2
+    from google.cloud.proto.datastore.v1 import entity_pb2
 
     key = entity_pb2.Key()
     elem = key.path.add()