Commit dd3313bf authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

Fixed #10654 -- Removed 'Does it have syntax errors' from the ImportError in... 

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
parent 4e25bc71

django/conf/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -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.