Move helper function after class defs.

Fix typo.

See:
#487 (comment)
#487 (comment)

Author: tseaver

gcloud/datastore/query.py

@@ -363,73 +363,6 @@ def fetch(self, limit=0, offset=0, start_cursor=None, end_cursor=None):
         return _Iterator(self, limit, offset, start_cursor, end_cursor)
 
 
-def _pb_from_query(query):
-    """Convert a Query instance to the corresponding protobuf.
-
-    :type query: :class:`Query`
-    :param query:  the source query
-
-    :rtype: :class:`gcloud.datastore.datastore_v1_pb2.Query`
-    :returns: a protobuf that can be sent to the protobuf API.  N.b. that
-              it does not contain "in-flight" fields for ongoing query
-              executions (cursors, offset, limit).
-    """
-    pb = datastore_pb.Query()
-
-    for projection_name in query.projection:
-        pb.projection.add().property.name = projection_name
-
-    if query.kind:
-        pb.kind.add().name = query.kind
-
-    composite_filter = pb.filter.composite_filter
-    composite_filter.operator = datastore_pb.CompositeFilter.AND
-
-    if query.ancestor:
-        ancestor_pb = helpers._prepare_key_for_request(
-            query.ancestor.to_protobuf())
-
-        # Filter on __key__ HAS_ANCESTOR == ancestor.
-        ancestor_filter = composite_filter.filter.add().property_filter
-        ancestor_filter.property.name = '__key__'
-        ancestor_filter.operator = datastore_pb.PropertyFilter.HAS_ANCESTOR
-        ancestor_filter.value.key_value.CopyFrom(ancestor_pb)
-
-    for property_name, operator, value in query.filters:
-        pb_op_enum = query.OPERATORS.get(operator)
-
-        # Add the specific filter
-        property_filter = composite_filter.filter.add().property_filter
-        property_filter.property.name = property_name
-        property_filter.operator = pb_op_enum
-
-        # Set the value to filter on based on the type.
-        if property_name == '__key__':
-            key_pb = value.to_protobuf()
-            property_filter.value.key_value.CopyFrom(
-                helpers._prepare_key_for_request(key_pb))
-        else:
-            helpers._set_protobuf_value(property_filter.value, value)
-
-    if not composite_filter.filter:
-        pb.ClearField('filter')
-
-    for prop in query.order:
-        property_order = pb.order.add()
-
-        if prop.startswith('-'):
-            property_order.property.name = prop[1:]
-            property_order.direction = property_order.DESCENDING
-        else:
-            property_order.property.name = prop
-            property_order.direction = property_order.ASCENDING
-
-    for group_by_name in query.group_by:
-        pb.group_by.add().name = group_by_name
-
-    return pb
-
-
 class _Iterator(object):
     """Represent the state of a given execution of a Query.
     """
@@ -455,7 +388,7 @@ def next_page(self):
         Low-level API for fine control:  the more convenient API is
         to iterate on us.
 
-        :rtyoe: tuple, (entities, more_results, cursor)
+        :rtype: tuple, (entities, more_results, cursor)
         """
         pb = _pb_from_query(self._query)
 
@@ -514,3 +447,70 @@ def __iter__(self):
             if not self._more_results:
                 break
             self.next_page()
+
+
+def _pb_from_query(query):
+    """Convert a Query instance to the corresponding protobuf.
+
+    :type query: :class:`Query`
+    :param query:  the source query
+
+    :rtype: :class:`gcloud.datastore.datastore_v1_pb2.Query`
+    :returns: a protobuf that can be sent to the protobuf API.  N.b. that
+              it does not contain "in-flight" fields for ongoing query
+              executions (cursors, offset, limit).
+    """
+    pb = datastore_pb.Query()
+
+    for projection_name in query.projection:
+        pb.projection.add().property.name = projection_name
+
+    if query.kind:
+        pb.kind.add().name = query.kind
+
+    composite_filter = pb.filter.composite_filter
+    composite_filter.operator = datastore_pb.CompositeFilter.AND
+
+    if query.ancestor:
+        ancestor_pb = helpers._prepare_key_for_request(
+            query.ancestor.to_protobuf())
+
+        # Filter on __key__ HAS_ANCESTOR == ancestor.
+        ancestor_filter = composite_filter.filter.add().property_filter
+        ancestor_filter.property.name = '__key__'
+        ancestor_filter.operator = datastore_pb.PropertyFilter.HAS_ANCESTOR
+        ancestor_filter.value.key_value.CopyFrom(ancestor_pb)
+
+    for property_name, operator, value in query.filters:
+        pb_op_enum = query.OPERATORS.get(operator)
+
+        # Add the specific filter
+        property_filter = composite_filter.filter.add().property_filter
+        property_filter.property.name = property_name
+        property_filter.operator = pb_op_enum
+
+        # Set the value to filter on based on the type.
+        if property_name == '__key__':
+            key_pb = value.to_protobuf()
+            property_filter.value.key_value.CopyFrom(
+                helpers._prepare_key_for_request(key_pb))
+        else:
+            helpers._set_protobuf_value(property_filter.value, value)
+
+    if not composite_filter.filter:
+        pb.ClearField('filter')
+
+    for prop in query.order:
+        property_order = pb.order.add()
+
+        if prop.startswith('-'):
+            property_order.property.name = prop[1:]
+            property_order.direction = property_order.DESCENDING
+        else:
+            property_order.property.name = prop
+            property_order.direction = property_order.ASCENDING
+
+    for group_by_name in query.group_by:
+        pb.group_by.add().name = group_by_name
+
+    return pb