Remove implicit dataset ID lookup from key.

Author: tseaver

gcloud/datastore/key.py

@@ -17,7 +17,6 @@
 import copy
 import six
 
-from gcloud.datastore import _implicit_environ
 from gcloud.datastore import _datastore_v1_pb2 as datastore_pb
 
 
@@ -395,15 +394,11 @@ def _validate_dataset_id(dataset_id, parent):
     :rtype: string
     :returns: The ``dataset_id`` passed in, or implied from the environment.
     :raises: :class:`ValueError` if ``dataset_id`` is ``None`` and no dataset
-             can be inferred.
+             can be inferred from the parent.
     """
     if parent is None:
-
         if dataset_id is None:
-
-            dataset_id = _implicit_environ.get_default_dataset_id()
-            if dataset_id is None:
-                raise ValueError("A Key must have a dataset ID set.")
+            raise ValueError("A Key must have a dataset ID set.")
 
     return dataset_id
 

gcloud/datastore/test_key.py

@@ -19,44 +19,21 @@ class TestKey(unittest2.TestCase):
 
     _DEFAULT_DATASET = 'DATASET'
 
-    def setUp(self):
-        from gcloud.datastore._testing import _setup_defaults
-        _setup_defaults(self)
-
-    def tearDown(self):
-        from gcloud.datastore._testing import _tear_down_defaults
-        _tear_down_defaults(self)
-
     def _getTargetClass(self):
         from gcloud.datastore.key import Key
         return Key
 
     def _makeOne(self, *args, **kwargs):
         return self._getTargetClass()(*args, **kwargs)
 
-    def _monkeyDatasetID(self, dataset_id=_DEFAULT_DATASET):
-        from gcloud.datastore._testing import _monkey_defaults
-        return _monkey_defaults(dataset_id=dataset_id)
-
     def test_ctor_empty(self):
         self.assertRaises(ValueError, self._makeOne)
 
     def test_ctor_no_dataset_id(self):
         klass = self._getTargetClass()
-        with self._monkeyDatasetID(None):
-            self.assertRaises(ValueError, klass, 'KIND')
-
-    def test_ctor_w_implicit_dataset_id(self):
-        _DATASET = 'DATASET'
-        _KIND = 'KIND'
-        with self._monkeyDatasetID(_DATASET):
-            key = self._makeOne(_KIND)
-        self.assertEqual(key.dataset_id, _DATASET)
-        self.assertEqual(key.namespace, None)
-        self.assertEqual(key.kind, _KIND)
-        self.assertEqual(key.path, [{'kind': _KIND}])
+        self.assertRaises(ValueError, klass, 'KIND')
 
-    def test_ctor_w_implicit_dataset_id_empty_path(self):
+    def test_ctor_w_explicit_dataset_id_empty_path(self):
         _DATASET = 'DATASET'
         self.assertRaises(ValueError, self._makeOne, dataset_id=_DATASET)