summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2011-03-14 23:06:06 +0000
committerAdrian Holovaty <adrian@holovaty.com>2011-03-14 23:06:06 +0000
commitdd3313bf6d4e1928829e6e5c53579fbfdf8ed43f (patch)
tree85ea0746c7e76cac2ae581b764d1027fe394eb4e
parent4e25bc71b18e609768c4cf99854f350a5bc8e44d (diff)
Fixed #10654 -- Removed 'Does it have syntax errors' from the ImportError in django/conf/__init__.py. Evidently syntax errors raise a SyntaxError. Thanks, gutworth and alexr
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/conf/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/conf/__init__.py b/django/conf/__init__.py
index 47eec6ad05..f2012a6400 100644
--- a/django/conf/__init__.py
+++ b/django/conf/__init__.py
@@ -86,7 +86,7 @@ class Settings(BaseSettings):
try:
mod = importlib.import_module(self.SETTINGS_MODULE)
except ImportError, e:
- raise ImportError("Could not import settings '%s' (Is it on sys.path? Does it have syntax errors?): %s" % (self.SETTINGS_MODULE, e))
+ raise ImportError("Could not import settings '%s' (Is it on sys.path?): %s" % (self.SETTINGS_MODULE, e))
# Settings that should be converted into tuples if they're mistakenly entered
# as strings.