pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/flosch/mongoengine into v0.4

Browse Source
This commit is contained in:
Harry Marr 2010-08-30 17:29:59 +01:00
commit 9540555b26
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
*.pyc *.pyc
.*.swp .*.swp
*.egg
docs/.build docs/.build
docs/_build docs/_build
build/ build/

9
mongoengine/base.py
View File

@ -257,7 +257,7 @@ class TopLevelDocumentMetaclass(DocumentMetaclass):
new_class = super_new(cls, name, bases, attrs) new_class = super_new(cls, name, bases, attrs)
# Provide a default queryset unless one has been manually provided # Provide a default queryset unless one has been manually provided
if not 'objects' in dir(new_class): if not hasattr(new_class, 'objects'):
new_class.objects = QuerySetManager() new_class.objects = QuerySetManager()
user_indexes = [QuerySet._build_index_spec(new_class, spec) user_indexes = [QuerySet._build_index_spec(new_class, spec)
@ -418,11 +418,8 @@ class BaseDocument(object):
self._meta.get('allow_inheritance', True) == False): self._meta.get('allow_inheritance', True) == False):
data['_cls'] = self._class_name data['_cls'] = self._class_name
data['_types'] = self._superclasses.keys() + [self._class_name] data['_types'] = self._superclasses.keys() + [self._class_name]
try: if data.has_key('_id') and not data['_id']:
if not data['_id']: del data['_id']
del data['_id']
except KeyError:
pass
return data return data
@classmethod @classmethod