summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-03-10 12:34:49 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-03-10 12:34:49 +0000
commit1db672f34735e0338316062e511aa17d24108524 (patch)
tree321bb53a2cdde5eee5243455501fc364e81c7df3
parente5d23d8c47653ee319b6bf04d666bee567fd3427 (diff)
Fixed #12999 -- Modified the contenttypes syncdb handler to use db router logic. Thanks to lsbardel for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/contenttypes/management.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/django/contrib/contenttypes/management.py b/django/contrib/contenttypes/management.py
index 61ee28548b..736e213665 100644
--- a/django/contrib/contenttypes/management.py
+++ b/django/contrib/contenttypes/management.py
@@ -7,22 +7,21 @@ def update_contenttypes(app, created_models, verbosity=2, **kwargs):
Creates content types for models in the given app, removing any model
entries that no longer have a matching model class.
"""
- db = kwargs['db']
ContentType.objects.clear_cache()
- content_types = list(ContentType.objects.using(db).filter(app_label=app.__name__.split('.')[-2]))
+ content_types = list(ContentType.objects.filter(app_label=app.__name__.split('.')[-2]))
app_models = get_models(app)
if not app_models:
return
for klass in app_models:
opts = klass._meta
try:
- ct = ContentType.objects.using(db).get(app_label=opts.app_label,
- model=opts.object_name.lower())
+ ct = ContentType.objects.get(app_label=opts.app_label,
+ model=opts.object_name.lower())
content_types.remove(ct)
except ContentType.DoesNotExist:
ct = ContentType(name=smart_unicode(opts.verbose_name_raw),
app_label=opts.app_label, model=opts.object_name.lower())
- ct.save(using=db)
+ ct.save()
if verbosity >= 2:
print "Adding content type '%s | %s'" % (ct.app_label, ct.model)
# The presence of any remaining content types means the supplied app has an