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

Merge remote branch 'hmarr/master'

Browse Source 
Conflicts:
	mongoengine/queryset.py
This commit is contained in:
Florian Schlachter
2010-01-31 17:43:56 +01:00
parent bbfc2f416e e05d31eaaf
commit 963a223e7e
5 changed files with 130 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mongoengine/base.py
View File

@@ -352,19 +352,15 @@ class BaseDocument(object):
if value is not None:
data[field.name] = field.to_mongo(value)
# Only add _cls and _types if allow_inheritance is not False
#if not (hasattr(self, '_meta') and
# self._meta.get('allow_inheritance', True) == False):
ah = True
if hasattr(self, '_meta'):
ah = self._meta.get('allow_inheritance', True)
if ah:
if not (hasattr(self, '_meta') and
self._meta.get('allow_inheritance', True) == False):
data['_cls'] = self._class_name
data['_types'] = self._superclasses.keys() + [self._class_name]
return data
@classmethod
def _from_son(cls, son):
"""Create an instance of a Document (subclass) from a PyMongo SOM.
"""Create an instance of a Document (subclass) from a PyMongo SON.
"""
# get the class name from the document, falling back to the given
# class if unavailable