Rename alternate factories for clarity.

Author: tseaver

gcloud/datastore/_helpers.py

@@ -148,7 +148,7 @@ def _get_value_from_value_pb(value_pb):
         result = naive.replace(tzinfo=pytz.utc)
 
     elif value_pb.HasField('key_value'):
-        result = _FACTORIES.get('Key_pb')(value_pb.key_value)
+        result = _FACTORIES.get('Key_from_protobuf')(value_pb.key_value)
 
     elif value_pb.HasField('boolean_value'):
         result = value_pb.boolean_value
@@ -166,7 +166,7 @@ def _get_value_from_value_pb(value_pb):
         result = value_pb.blob_value
 
     elif value_pb.HasField('entity_value'):
-        result = _FACTORIES.get('Entity_pb')(value_pb.entity_value)
+        result = _FACTORIES.get('Entity_from_protobuf')(value_pb.entity_value)
 
     elif value_pb.list_value:
         result = [_get_value_from_value_pb(x) for x in value_pb.list_value]

gcloud/datastore/dataset.py

@@ -105,7 +105,7 @@ def get_entities(self, keys):
         entities = []
         for entity_pb in entity_pbs:
             entities.append(_helpers._FACTORIES.invoke(
-                'Entity_pb', entity_pb, dataset=self))
+                'Entity_from_protobuf', entity_pb, dataset=self))
         return entities
 
 

gcloud/datastore/entity.py

@@ -151,7 +151,8 @@ def from_protobuf(cls, pb, dataset=None):
         :returns: The :class:`Entity` derived from the
                   :class:`gcloud.datastore.datastore_v1_pb2.Entity`.
         """
-        key = _helpers._FACTORIES.invoke('Key_pb', pb.key, dataset=dataset)
+        key = _helpers._FACTORIES.invoke(
+            'Key_from_protobuf', pb.key, dataset=dataset)
         entity = cls.from_key(key)
 
         for property_pb in pb.property:
@@ -223,7 +224,8 @@ def save(self):
             transaction.add_auto_id_entity(self)
 
         if isinstance(key_pb, datastore_pb.Key):
-            updated_key = _helpers._FACTORIES.invoke('Key_pb', key_pb, dataset)
+            updated_key = _helpers._FACTORIES.invoke(
+                'Key_from_protobuf', key_pb, dataset)
             # Update the path (which may have been altered).
             self._key = key.path(updated_key.path())
 
@@ -253,4 +255,4 @@ def __repr__(self):
 
 
 _helpers._FACTORIES.register('Entity', Entity)
-_helpers._FACTORIES.register('Entity_pb', Entity.from_protobuf)
+_helpers._FACTORIES.register('Entity_from_protobuf', Entity.from_protobuf)

gcloud/datastore/key.py

@@ -292,5 +292,5 @@ def __repr__(self):
 
 
 _helpers._FACTORIES.register('Key', Key)
-_helpers._FACTORIES.register('Key_pb', Key.from_protobuf)
-_helpers._FACTORIES.register('Key_path', Key.from_path)
+_helpers._FACTORIES.register('Key_from_protobuf', Key.from_protobuf)
+_helpers._FACTORIES.register('Key_from_path', Key.from_path)

gcloud/datastore/query.py

@@ -189,7 +189,7 @@ def ancestor(self, ancestor):
 
         # If a list was provided, turn it into a Key.
         if isinstance(ancestor, list):
-            ancestor = _helpers._FACTORIES.invoke('Key_path', *ancestor)
+            ancestor = _helpers._FACTORIES.invoke('Key_from_path', *ancestor)
 
         # If we don't have a Key value by now, something is wrong.
         if not isinstance(ancestor, _helpers._FACTORIES.get('Key')):
@@ -322,7 +322,7 @@ def fetch(self, limit=None):
         entity_pbs, end_cursor = query_results[:2]
 
         self._cursor = end_cursor
-        return [_helpers._FACTORIES.invoke('Entity_pb', entity,
+        return [_helpers._FACTORIES.invoke('Entity_from_protobuf', entity,
                                            dataset=self.dataset())
                 for entity in entity_pbs]
 

gcloud/datastore/transaction.py

@@ -237,7 +237,7 @@ def commit(self):
                 key_pb = result.insert_auto_id_key[i]
                 # We can ignore the 'dataset' parameter ecause we are only
                 # creating a transient instance in order to copy its path.
-                key = _helpers._FACTORIES.invoke('Key_pb', key_pb)
+                key = _helpers._FACTORIES.invoke('Key_from_protobuf', key_pb)
                 entity.key(entity.key().path(key.path()))
 
         # Tell the connection that the transaction is over.