Merge pull request jschrewe#8 from flisky/master

Jan Schrewe · Jan Schrewe · commit ed588dbcc92e · 2012-05-17T07:49:28.000-07:00
pymongo 1.9 compatibility and other two small updates
diff --git a/mongodbforms/documents.py b/mongodbforms/documents.py
@@ -158,7 +158,7 @@ def fields_for_document(document, fields=None, exclude=None, widgets=None, \
     for f in sorted_fields:
         if isinstance(f, ObjectIdField):
             continue
-        if isinstance(f, ListField) and not isinstance(f.field, ReferenceField):
+        if isinstance(f, ListField) and not (f.field.choices or isinstance(f.field, ReferenceField)):
             continue
         if fields is not None and not f.name in fields:
             continue
diff --git a/mongodbforms/fields.py b/mongodbforms/fields.py
@@ -7,12 +7,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
