Rename 'Connection.rollback_transaction' -> 'rollback'.

tseaver · tseaver · commit d5882e3e365a · 2014-10-27T16:58:17.000-04:00
Makes it consistent w/ 'commit', as well as matching the protobuf RPC.
diff --git a/gcloud/datastore/connection.py b/gcloud/datastore/connection.py
@@ -324,7 +324,7 @@ def commit(self, dataset_id, mutation_pb):
                              datastore_pb.CommitResponse)
         return response.mutation_result
 
-    def rollback_transaction(self, dataset_id):
+    def rollback(self, dataset_id):
         """Rollback the connection's existing transaction.
 
         Raises a ``ValueError``
diff --git a/gcloud/datastore/test_connection.py b/gcloud/datastore/test_connection.py
@@ -509,13 +509,13 @@ def id(self):
         self.assertEqual(request.mutation, mutation)
         self.assertEqual(request.mode, rq_class.TRANSACTIONAL)
 
-    def test_rollback_transaction_wo_existing_transaction(self):
+    def test_rollback_wo_existing_transaction(self):
         DATASET_ID = 'DATASET'
         conn = self._makeOne()
         self.assertRaises(ValueError,
-                          conn.rollback_transaction, DATASET_ID)
+                          conn.rollback, DATASET_ID)
 
-    def test_rollback_transaction_w_existing_transaction_no_id(self):
+    def test_rollback_w_existing_transaction_no_id(self):
 
         class Xact(object):
 
@@ -525,9 +525,9 @@ def id(self):
         conn = self._makeOne()
         conn.transaction(Xact())
         self.assertRaises(ValueError,
-                          conn.rollback_transaction, DATASET_ID)
+                          conn.rollback, DATASET_ID)
 
-    def test_rollback_transaction_ok(self):
+    def test_rollback_ok(self):
         from gcloud.datastore.connection import datastore_pb
         DATASET_ID = 'DATASET'
         TRANSACTION = 'xact'
@@ -548,7 +548,7 @@ def id(self):
             'rollback',
         ])
         http = conn._http = Http({'status': '200'}, rsp_pb.SerializeToString())
-        self.assertEqual(conn.rollback_transaction(DATASET_ID), None)
+        self.assertEqual(conn.rollback(DATASET_ID), None)
         cw = http._called_with
         self.assertEqual(cw['uri'], URI)
         self.assertEqual(cw['method'], 'POST')
diff --git a/gcloud/datastore/test_transaction.py b/gcloud/datastore/test_transaction.py
@@ -174,7 +174,7 @@ def begin_transaction(self, dataset_id):
         self._begun = dataset_id
         return self._xact_id
 
-    def rollback_transaction(self, dataset_id):
+    def rollback(self, dataset_id):
         self._rolled_back = dataset_id
 
     def commit(self, dataset_id, mutation):
diff --git a/gcloud/datastore/transaction.py b/gcloud/datastore/transaction.py
@@ -210,7 +210,7 @@ def rollback(self):
         - Sets the current connection's transaction reference to None.
         - Sets the current transaction's ID to None.
         """
-        self.connection().rollback_transaction(self.dataset().id())
+        self.connection().rollback(self.dataset().id())
         self.connection().transaction(None)
         self._id = None
 
