compatible with pymongo 1.9 and above

flisky · flisky · commit be138ba196da · 2012-05-04T11:35:56.000+08:00
see http://api.mongodb.org/python/current/changelog.html#changes-in-version-1-9
diff --git a/mongodbforms/fields.py b/mongodbforms/fields.py
@@ -8,11 +8,16 @@
 from django import forms
 from django.core.validators import EMPTY_VALUES
 from django.utils.translation import ugettext as _
-from pymongo.errors import InvalidId
-from pymongo.objectid import ObjectId
 from django.utils.encoding import smart_unicode, force_unicode
 from django.utils.translation import ugettext_lazy as _
 
+try:  # objectid was moved into bson in pymongo 1.9
+    from bson.objectid import ObjectId
+    from bson.errors import InvalidId
+except ImportError:
+    from pymongo.objectid import ObjectId
+    from pymongo.errors import InvalidId
+
 class MongoChoiceIterator(object):
     def __init__(self, field):
         self.field = field
