diff options
author | Justin Bronn <jbronn@gmail.com> | 2008-08-05 17:15:33 +0000 |
---|---|---|
committer | Justin Bronn <jbronn@gmail.com> | 2008-08-05 17:15:33 +0000 |
commit | aa239e3e5405933af6a29dac3cf587b59a099927 (patch) | |
tree | ea2cbd139c9a8cf84c09e0b2008bff70e05927ef /django/db/models/__init__.py | |
parent | 45b73c9a4685809236f84046cc7ffd32a50db958 (diff) | |
download | django-attic/gis.tar.gz |
gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.archive/attic/gisattic/gis
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/__init__.py')
-rw-r--r-- | django/db/models/__init__.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/django/db/models/__init__.py b/django/db/models/__init__.py index bd6cc3542d..18c47e86f3 100644 --- a/django/db/models/__init__.py +++ b/django/db/models/__init__.py @@ -10,8 +10,6 @@ from django.db.models.fields import * from django.db.models.fields.subclassing import SubfieldBase from django.db.models.fields.related import ForeignKey, OneToOneField, ManyToManyField, ManyToOneRel, ManyToManyRel, OneToOneRel, TABULAR, STACKED from django.db.models import signals -from django.utils.functional import curry -from django.utils.text import capfirst # Admin stages. ADD, CHANGE, BOTH = 1, 2, 3 |