mirror of https://github.com/django/django.git
Fixed #7387 - Fixed circular import problem when importing `contrib.contenttypes.generic` module.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7635 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
d1b5902dac
commit
0b8fafc7f1
|
@ -2,10 +2,9 @@
|
||||||
Query subclasses which provide extra functionality beyond simple data retrieval.
|
Query subclasses which provide extra functionality beyond simple data retrieval.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from django.contrib.contenttypes import generic
|
|
||||||
from django.core.exceptions import FieldError
|
from django.core.exceptions import FieldError
|
||||||
from django.db.models.sql.constants import *
|
from django.db.models.sql.constants import *
|
||||||
from django.db.models.sql.datastructures import RawValue, Date
|
from django.db.models.sql.datastructures import Date
|
||||||
from django.db.models.sql.query import Query
|
from django.db.models.sql.query import Query
|
||||||
from django.db.models.sql.where import AND
|
from django.db.models.sql.where import AND
|
||||||
|
|
||||||
|
@ -43,6 +42,7 @@ class DeleteQuery(Query):
|
||||||
More than one physical query may be executed if there are a
|
More than one physical query may be executed if there are a
|
||||||
lot of values in pk_list.
|
lot of values in pk_list.
|
||||||
"""
|
"""
|
||||||
|
from django.contrib.contenttypes import generic
|
||||||
cls = self.model
|
cls = self.model
|
||||||
for related in cls._meta.get_all_related_many_to_many_objects():
|
for related in cls._meta.get_all_related_many_to_many_objects():
|
||||||
if not isinstance(related.field, generic.GenericRelation):
|
if not isinstance(related.field, generic.GenericRelation):
|
||||||
|
@ -382,4 +382,3 @@ class CountQuery(Query):
|
||||||
|
|
||||||
def get_ordering(self):
|
def get_ordering(self):
|
||||||
return ()
|
return ()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue