merge conflicts; correct imports

Author: chemelnucfin

datastore/google/cloud/datastore/helpers.py

@@ -23,6 +23,7 @@
 
 from google.cloud._helpers import _datetime_to_pb_timestamp
 from google.cloud._helpers import _pb_timestamp_to_datetime
+from google.cloud.datastore_v1.proto import datastore_pb2
 from google.cloud.datastore_v1.proto import entity_pb2
 from google.cloud.datastore.entity import Entity
 from google.cloud.datastore.key import Key

datastore/tests/unit/test_helpers.py

@@ -510,23 +510,23 @@ def test_eventual_w_transaction(self):
             self._call_fut(True, b'123')
 
     def test_eventual_wo_transaction(self):
-        from google.cloud.proto.datastore.v1 import datastore_pb2
+        from google.cloud.datastore_v1.proto import datastore_pb2
 
         read_options = self._call_fut(True, None)
         expected = datastore_pb2.ReadOptions(
             read_consistency=datastore_pb2.ReadOptions.EVENTUAL)
         self.assertEqual(read_options, expected)
 
     def test_default_w_transaction(self):
-        from google.cloud.proto.datastore.v1 import datastore_pb2
+        from google.cloud.datastore_v1.proto import datastore_pb2
 
         txn_id = b'123abc-easy-as'
         read_options = self._call_fut(False, txn_id)
         expected = datastore_pb2.ReadOptions(transaction=txn_id)
         self.assertEqual(read_options, expected)
 
     def test_default_wo_transaction(self):
-        from google.cloud.proto.datastore.v1 import datastore_pb2
+        from google.cloud.datastore_v1.proto import datastore_pb2
 
         read_options = self._call_fut(False, None)
         expected = datastore_pb2.ReadOptions()