Merge pull request #316 from wpjunior/fixes-315

Fixes for #315 issue

mongoengine/base.py

@@ -739,16 +739,6 @@ class BaseDocument(object):
             elif field.required:
                 raise ValidationError('Field "%s" is required' % field.name)
 
-    @apply
-    def pk():
-        """Primary key alias
-        """
-        def fget(self):
-            return getattr(self, self._meta['id_field'])
-        def fset(self, value):
-            return setattr(self, self._meta['id_field'], value)
-        return property(fget, fset)
-
     def to_mongo(self):
         """Return data dictionary ready for use with MongoDB.
         """

mongoengine/document.py

@@ -76,6 +76,16 @@ class Document(BaseDocument):
     by setting index_types to False on the meta dictionary for the document.
     """
     __metaclass__ = TopLevelDocumentMetaclass
+    
+    @apply
+    def pk():
+        """Primary key alias
+        """
+        def fget(self):
+            return getattr(self, self._meta['id_field'])
+        def fset(self, value):
+            return setattr(self, self._meta['id_field'], value)
+        return property(fget, fset)
 
     @classmethod
     def _get_collection(self):

setup.py

@@ -47,5 +47,5 @@ setup(name='mongoengine',
       classifiers=CLASSIFIERS,
       install_requires=['pymongo'],
       test_suite='tests',
-      tests_require=['blinker', 'django==1.3']
+      tests_require=['blinker', 'django>=1.3']
 )