summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2010-07-20 19:33:32 +0000
committerAlex Gaynor <alex.gaynor@gmail.com>2010-07-20 19:33:32 +0000
commit9944d8d5efbe514e8de1d9adcc316a61fded3b65 (patch)
tree6ba9d2bcf1b77b8b3081aac5e0be055a6e7db4e6 /django
parent9c6e1c89c595de5b6bd3180d59faf944a3093d6d (diff)
[soc2010/query-refactor] Added a ListField, currently only works on MongoDB.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/query-refactor@13441 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/db/models/__init__.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/django/db/models/__init__.py b/django/db/models/__init__.py
index c28bce86bf..0736648a7b 100644
--- a/django/db/models/__init__.py
+++ b/django/db/models/__init__.py
@@ -1,7 +1,8 @@
from django.conf import settings
from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured
from django.db import connection
-from django.db.models.loading import get_apps, get_app, get_models, get_model, register_models
+from django.db.models.loading import (get_apps, get_app, get_models, get_model,
+ register_models)
from django.db.models.query import Q
from django.db.models.expressions import F
from django.db.models.manager import Manager
@@ -10,7 +11,9 @@ from django.db.models.aggregates import *
from django.db.models.fields import *
from django.db.models.fields.subclassing import SubfieldBase
from django.db.models.fields.files import FileField, ImageField
-from django.db.models.fields.related import ForeignKey, OneToOneField, ManyToManyField, ManyToOneRel, ManyToManyRel, OneToOneRel
+from django.db.models.fields.related import (ForeignKey, OneToOneField,
+ ManyToManyField, ManyToOneRel, ManyToManyRel, OneToOneRel)
+from django.db.models.fields.structures import ListField
from django.db.models import signals
# Admin stages.