Permalink
Browse files

Fixed #7387 - Fixed circular import problem when importing `contrib.c…

…ontenttypes.generic` module.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7635 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent d1b5902 commit 0b8fafc7f13601235d4bc9bf735ac8dafcc0b04a @gdub gdub committed Jun 15, 2008
Showing with 2 additions and 3 deletions.
  1. +2 −3 django/db/models/sql/subqueries.py
@@ -2,10 +2,9 @@
Query subclasses which provide extra functionality beyond simple data retrieval.
"""
-from django.contrib.contenttypes import generic
from django.core.exceptions import FieldError
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.where import AND
@@ -43,6 +42,7 @@ def delete_batch_related(self, pk_list):
More than one physical query may be executed if there are a
lot of values in pk_list.
"""
+ from django.contrib.contenttypes import generic
cls = self.model
for related in cls._meta.get_all_related_many_to_many_objects():
if not isinstance(related.field, generic.GenericRelation):
@@ -382,4 +382,3 @@ def get_from_clause(self):
def get_ordering(self):
return ()
-

0 comments on commit 0b8fafc

Please sign in to comment.