Renamed Document._id to id (still _id in DB)

Although MongoDB uses _id, underscore prefixed attributes imply
private access in Python and are sometimes may not be accessed
(e.g. in the Django template language), but id should be public.

mongoengine/base.py

@@ -147,7 +147,7 @@ class TopLevelDocumentMetaclass(DocumentMetaclass):
         meta.update(attrs.get('meta', {}))
         attrs['_meta'] = meta
 
-        attrs['_id'] = ObjectIdField()
+        attrs['id'] = ObjectIdField(name='_id')
 
         # Set up collection manager, needs the class to have fields so use
         # DocumentMetaclass before instantiating CollectionManager object
@@ -225,7 +225,7 @@ class BaseDocument(object):
         for field_name, field in self._fields.items():
             value = getattr(self, field_name, None)
             if value is not None:
-                data[field_name] = field.to_mongo(value)
+                data[field.name] = field.to_mongo(value)
         data['_cls'] = self._class_name
         data['_types'] = self._superclasses.keys() + [self._class_name]
         return data
@@ -248,7 +248,7 @@ class BaseDocument(object):
             cls = subclasses[class_name]
 
         for field_name, field in cls._fields.items():
-            if field_name in data:
-                data[field_name] = field.to_python(data[field_name])
+            if field.name in data:
+                data[field_name] = field.to_python(data[field.name])
 
         return cls(**data)

mongoengine/document.py

@@ -18,8 +18,8 @@ class Document(BaseDocument):
         """Save the document to the database. If the document already exists,
         it will be updated, otherwise it will be created.
         """
-        _id = self.objects._collection.save(self.to_mongo())
-        self._id = _id
+        object_id = self.objects._collection.save(self.to_mongo())
+        self.id = object_id
 
     @classmethod
     def drop_collection(cls):

mongoengine/fields.py

@@ -179,19 +179,19 @@ class ReferenceField(BaseField):
 
     def to_mongo(self, document):
         if isinstance(document, (str, unicode, pymongo.objectid.ObjectId)):
-            _id = document
+            id_ = document
         else:
             try:
-                _id = document._id
+                id_ = document.id
             except:
                 raise ValidationError('You can only reference documents once '
                                       'they have been saved to the database')
 
-        if not isinstance(_id, pymongo.objectid.ObjectId):
-            _id = pymongo.objectid.ObjectId(_id)
+        if not isinstance(id_, pymongo.objectid.ObjectId):
+            id_ = pymongo.objectid.ObjectId(id_)
 
         collection = self.document_type._meta['collection']
-        return pymongo.dbref.DBRef(collection, _id)
+        return pymongo.dbref.DBRef(collection, id_)
 
     def validate(self, value):
         assert(isinstance(value, (self.document_type, pymongo.dbref.DBRef)))