summaryrefslogtreecommitdiff
path: root/django/db/models/__init__.py
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-05-08 10:59:35 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-05-08 10:59:35 +0000
commit1c53661bd14cbb19138bd7f9dbc03074c58d63c2 (patch)
treee9928b76b954192c39e0683c56efd553484435cd /django/db/models/__init__.py
parent0839a0046a09bc80a9cfe02dcc462cb9e4dc2521 (diff)
downloaddjango-1c53661bd14cbb19138bd7f9dbc03074c58d63c2.tar.gz
Moved generic relations into django.contrib.contenttypes, since it depends on
that to work. Backwards incompatible change. git-svn-id: http://code.djangoproject.com/svn/django/trunk@5172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/__init__.py')
-rw-r--r--django/db/models/__init__.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/django/db/models/__init__.py b/django/db/models/__init__.py
index ccd60023f9..6c3abb6b59 100644
--- a/django/db/models/__init__.py
+++ b/django/db/models/__init__.py
@@ -8,7 +8,6 @@ from django.db.models.manager import Manager
from django.db.models.base import Model, AdminOptions
from django.db.models.fields import *
from django.db.models.fields.related import ForeignKey, OneToOneField, ManyToManyField, ManyToOneRel, ManyToManyRel, OneToOneRel, TABULAR, STACKED
-from django.db.models.fields.generic import GenericRelation, GenericRel, GenericForeignKey
from django.db.models import signals
from django.utils.functional import curry
from django.utils.text import capfirst