From 3d817f145c0a5f719fc05497ff500ec5f6a2345e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wilson=20J=C3=BAnior?= Date: Wed, 12 Oct 2011 18:28:40 -0300 Subject: [PATCH] fixes for #315 issue --- mongoengine/base.py | 10 ---------- mongoengine/document.py | 10 ++++++++++ setup.py | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mongoengine/base.py b/mongoengine/base.py index 881dd32f..ed14c745 100644 --- a/mongoengine/base.py +++ b/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. """ diff --git a/mongoengine/document.py b/mongoengine/document.py index a87f460e..82b94a3d 100644 --- a/mongoengine/document.py +++ b/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): diff --git a/setup.py b/setup.py index 6877b625..d4dd5abd 100644 --- a/setup.py +++ b/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'] )