Reverted document.delete auto gridfs delete

This commit is contained in:
Ross Lawley
2012-05-14 12:02:07 +01:00
parent bc7e874476
commit bab186e195
5 changed files with 9 additions and 53 deletions

View File

@@ -618,10 +618,6 @@ class DocumentMetaclass(type):
raise InvalidDocumentError("Reverse delete rules are not supported for EmbeddedDocuments (field: %s)" % field.name)
f.document_type.register_delete_rule(new_class, field.name, delete_rule)
proxy_class = getattr(field, 'proxy_class', None)
if proxy_class is not None:
new_class.register_proxy_field(field.name, proxy_class)
if field.name and hasattr(Document, field.name) and EmbeddedDocument not in new_class.mro():
raise InvalidDocumentError("%s is a document method and not a valid field name" % field.name)
@@ -723,7 +719,6 @@ class TopLevelDocumentMetaclass(DocumentMetaclass):
'index_opts': {},
'queryset_class': QuerySet,
'delete_rules': {},
'proxy_fields': {},
'allow_inheritance': True
}

View File

@@ -278,11 +278,6 @@ class Document(BaseDocument):
signals.pre_delete.send(self.__class__, document=self)
try:
for field_name in self._meta['proxy_fields']:
proxy_class = self._meta['proxy_fields'][field_name]
if hasattr(proxy_class, 'delete'):
proxy = getattr(self, field_name)
proxy.delete()
self.__class__.objects(pk=self.pk).delete(safe=safe)
except pymongo.errors.OperationFailure, err:
message = u'Could not delete document (%s)' % err.message
@@ -347,13 +342,6 @@ class Document(BaseDocument):
"""
cls._meta['delete_rules'][(document_cls, field_name)] = rule
@classmethod
def register_proxy_field(cls, field_name, proxy_class):
"""This method registers fields with proxy classes to delete them when
removing this object.
"""
cls._meta['proxy_fields'][field_name] = proxy_class
@classmethod
def drop_collection(cls):
"""Drops the entire collection associated with this