Fix rebase hork.

tseaver · tseaver · commit 76a918ea90ab · 2015-01-14T16:41:30.000-05:00
diff --git a/gcloud/datastore/connection.py b/gcloud/datastore/connection.py
@@ -126,23 +126,6 @@ def build_api_url(cls, dataset_id, method, base_url=None,
             api_version=(api_version or cls.API_VERSION),
             dataset_id=dataset_id, method=method)
 
-    def transaction(self, transaction=connection.Connection._EMPTY):
-        """Getter/setter for the connection's transaction object.
-
-        :type transaction: :class:`gcloud.datastore.transaction.Transaction`,
-                           (setting), or omitted (getting).
-        :param transaction: The new transaction (if passed).
-
-        :rtype: :class:`gcloud.datastore.transaction.Transaction`, (getting)
-                or :class:`gcloud.datastore.connection.Connection` (setting)
-        :returns: The current transaction (getting) or self (setting).
-        """
-        if transaction is self._EMPTY:
-            return self._current_transaction
-        else:
-            self._current_transaction = transaction
-            return self
-
     def lookup(self, dataset_id, key_pbs,
                missing=None, deferred=None, eventual=False):
         """Lookup keys from a dataset in the Cloud Datastore.
diff --git a/gcloud/datastore/test_connection.py b/gcloud/datastore/test_connection.py
@@ -179,16 +179,6 @@ def test_build_api_url_w_explicit_base_version(self):
         self.assertEqual(klass.build_api_url(DATASET_ID, METHOD, BASE, VER),
                          URI)
 
-    def test_transaction_getter_unset(self):
-        conn = self._makeOne()
-        self.assertTrue(conn.transaction() is None)
-
-    def test_transaction_setter(self):
-        xact = object()
-        conn = self._makeOne()
-        self.assertTrue(conn.transaction(xact) is conn)
-        self.assertTrue(conn.transaction() is xact)
-
     def test_lookup_single_key_empty_response(self):
         from gcloud.datastore import datastore_v1_pb2 as datastore_pb
 
