Return True from 'Connection.delete_entities' unconditionally.

tseaver · tseaver · commit 8ebace3d7fd7 · 2014-10-17T11:48:18.000-04:00
Fixes #168. Merges 169-connection_delete_entity, too.
diff --git a/gcloud/datastore/connection.py b/gcloud/datastore/connection.py
@@ -398,16 +398,15 @@ def delete_entities(self, dataset_id, key_pbs):
 
         :rtype: boolean (if in a transaction) or else
                 :class:`gcloud.datastore.datastore_v1_pb2.MutationResult`.
-        :returns: True (if in a transaction) or else a mutation result
-                  protobuf.
+        :returns: True
         """
         mutation = self.mutation()
 
         for key_pb in key_pbs:
             delete = mutation.delete.add()
             delete.CopyFrom(key_pb)
 
-        if self.transaction():
-            return True
-        else:
-            return self.commit(dataset_id, mutation)
+        if not self.transaction():
+            self.commit(dataset_id, mutation)
+
+        return True
diff --git a/gcloud/datastore/test_connection.py b/gcloud/datastore/test_connection.py
@@ -744,8 +744,7 @@ def test_delete_entities_wo_transaction(self):
                         'commit', ])
         http = conn._http = Http({'status': '200'}, rsp_pb.SerializeToString())
         result = conn.delete_entities(DATASET_ID, [key_pb])
-        self.assertEqual(result.index_updates, 0)
-        self.assertEqual(list(result.insert_auto_id_key), [])
+        self.assertEqual(result, True)
         cw = http._called_with
         self.assertEqual(cw['uri'], URI)
         self.assertEqual(cw['method'], 'POST')
