add support for geo indexing - see pymongo.GEO2D

doc/api/pymongo/collection.rst

@@ -7,3 +7,4 @@
 
    .. autodata:: pymongo.ASCENDING
    .. autodata:: pymongo.DESCENDING
+   .. autodata:: pymongo.GEO2D

pymongo/__init__.py

@@ -21,6 +21,16 @@ ASCENDING = 1
 DESCENDING = -1
 """Descending sort order."""
 
+GEO2D = "2d"
+"""Index specifier for a 2-dimensional `geospatial index`_.
+
+.. versionadded:: 1.5+
+
+.. note:: Geo-spatial indexing requires server version **>= 1.3.3+**.
+
+.. _geospatial index: http://www.mongodb.org/display/DOCS/Geospatial+Indexing
+"""
+
 OFF = 0
 """No database profiling."""
 SLOW_ONLY = 1

pymongo/collection.py

@@ -515,8 +515,8 @@ class Collection(object):
         Takes either a single key or a list of (key, direction) pairs.
         The key(s) must be an instance of :class:`basestring`, and the
         directions must be one of (:data:`~pymongo.ASCENDING`,
-        :data:`~pymongo.DESCENDING`). Returns the name of the created
-        index.
+        :data:`~pymongo.DESCENDING`, :data:`~pymongo.GEO2D`). Returns
+        the name of the created index.
 
         To create a single key index on the key ``'mike'`` we just use
         a string argument:
@@ -572,8 +572,8 @@ class Collection(object):
         Takes either a single key or a list of (key, direction) pairs.
         The key(s) must be an instance of :class:`basestring`, and the
         direction(s) must be one of (:data:`~pymongo.ASCENDING`,
-        :data:`~pymongo.DESCENDING`). See :meth:`create_index` for a
-        detailed example.
+        :data:`~pymongo.DESCENDING`, :data:`~pymongo.GEO2D`). See
+        :meth:`create_index` for a detailed example.
 
         Unlike :meth:`create_index`, which attempts to create an index
         unconditionally, :meth:`ensure_index` takes advantage of some

pymongo/helpers.py

@@ -65,9 +65,9 @@ def _index_document(index_list):
     for (key, value) in index_list:
         if not isinstance(key, basestring):
             raise TypeError("first item in each key pair must be a string")
-        if not isinstance(value, int):
-            raise TypeError("second item in each key pair must be ASCENDING or "
-                            "DESCENDING")
+        if value not in [pymongo.ASCENDING, pymongo.DESCENDING, pymongo.GEO2D]:
+            raise TypeError("second item in each key pair must be ASCENDING, "
+                            "DESCENDING, or GEO2D")
         index[key] = value
     return index