innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Moved import at proper place in contrib.sites

This commit is contained in:
Claude Paroz 2013-11-16 11:13:04 +01:00
parent ceecc962ad
commit b642d540d4
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/contrib/sites/models.py
View File

@ -2,11 +2,11 @@ from __future__ import unicode_literals
import string import string
from django.core.exceptions import ImproperlyConfigured, ValidationError
from django.db import models from django.db import models
from django.db.models.signals import pre_save, pre_delete from django.db.models.signals import pre_save, pre_delete
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.utils.encoding import python_2_unicode_compatible from django.utils.encoding import python_2_unicode_compatible
from django.core.exceptions import ValidationError
SITE_CACHE = {} SITE_CACHE = {}
@ -39,8 +39,10 @@ class SiteManager(models.Manager):
try: try:
sid = settings.SITE_ID sid = settings.SITE_ID
except AttributeError: except AttributeError:
from django.core.exceptions import ImproperlyConfigured raise ImproperlyConfigured(
raise ImproperlyConfigured("You're using the Django \"sites framework\" without having set the SITE_ID setting. Create a site in your database and set the SITE_ID setting to fix this error.") "You're using the Django \"sites framework\" without having "
"set the SITE_ID setting. Create a site in your database and "
"set the SITE_ID setting to fix this error.")
try: try:
current_site = SITE_CACHE[sid] current_site = SITE_CACHE[sid]
except KeyError: except KeyError: