test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[1.7.x] Fixed #22411: Throw a more helpful error if contenttypes doesn't exist. 

Conflicts:
	django/contrib/contenttypes/models.py
This commit is contained in:
Andrew Godwin 2014-09-05 11:59:10 -07:00
parent ffa9e60638
commit c5578ba9fa
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
django/contrib/contenttypes/models.py
View File

@ -2,6 +2,7 @@ from __future__ import unicode_literals
from django.apps import apps from django.apps import apps
from django.db import models from django.db import models
from django.db.utils import OperationalError, ProgrammingError
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.utils.encoding import smart_text, force_text from django.utils.encoding import smart_text, force_text
from django.utils.encoding import python_2_unicode_compatible from django.utils.encoding import python_2_unicode_compatible
@ -42,14 +43,20 @@ class ContentTypeManager(models.Manager):
try: try:
ct = self._get_from_cache(opts) ct = self._get_from_cache(opts)
except KeyError: except KeyError:
# Load or create the ContentType entry. The smart_text() is try:
# needed around opts.verbose_name_raw because name_raw might be a ct, created = self.get_or_create(
# django.utils.functional.__proxy__ object. app_label=opts.app_label,
ct, created = self.get_or_create( model=opts.model_name,
app_label=opts.app_label, defaults={'name': smart_text(opts.verbose_name_raw)},
model=opts.model_name, )
defaults={'name': smart_text(opts.verbose_name_raw)}, except (OperationalError, ProgrammingError):
) # It's possible to migrate a single app before contenttypes,
# as it's not a required initial dependency (it's contrib!)
# Have a nice error for this.
raise RuntimeError(
"Error creating new content types. Please make sure contenttypes" +
" is migrated before trying to migrate apps individually."
)
self._add_to_cache(self.db, ct) self._add_to_cache(self.db, ct)
return ct return ct