Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #14130 -- Made manage.py error reporting more useful when the s…

…ettings.py file triggers import errors (in new projects). Thanks Setok for the report, mk and steph for their work.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15522 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit a797b7dba0644558ca7bf825b22268f2b4d9d3b5 1 parent c7618d5
@ramiro ramiro authored
View
7 django/conf/project_template/manage.py
@@ -1,11 +1,14 @@
#!/usr/bin/env python
from django.core.management import execute_manager
+import imp
try:
- import settings # Assumed to be in the same directory.
+ imp.find_module('settings') # Assumed to be in the same directory.
except ImportError:
import sys
- sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
+ sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n" % __file__)
sys.exit(1)
+import settings
+
if __name__ == "__main__":
execute_manager(settings)
View
29 tests/regressiontests/admin_scripts/tests.py
@@ -958,6 +958,35 @@ def test_custom_command_with_environment(self):
self.assertNoOutput(out)
self.assertOutput(err, "Unknown command: 'noargs_command'")
+class ManageSettingsWithImportError(AdminScriptTestCase):
+ """Tests for manage.py when using the default settings.py file
+ with an import error. Ticket #14130.
+ """
+ def setUp(self):
+ self.write_settings_with_import_error('settings.py')
+
+ def tearDown(self):
+ self.remove_settings('settings.py')
+
+ def write_settings_with_import_error(self, filename, apps=None, is_dir=False, sdict=None):
+ test_dir = os.path.dirname(os.path.dirname(__file__))
+ if is_dir:
+ settings_dir = os.path.join(test_dir,filename)
+ os.mkdir(settings_dir)
+ settings_file = open(os.path.join(settings_dir,'__init__.py'), 'w')
+ else:
+ settings_file = open(os.path.join(test_dir, filename), 'w')
+ settings_file.write('# Settings file automatically generated by regressiontests.admin_scripts test case\n')
+ settings_file.write('# The next line will cause an import error:\nimport foo42bar\n')
+
+ settings_file.close()
+
+ def test_builtin_command(self):
+ "import error: manage.py builtin commands shows useful diagnostic info when settings with import errors is provided"
+ args = ['sqlall','admin_scripts']
+ out, err = self.run_manage(args)
+ self.assertNoOutput(out)
+ self.assertOutput(err, "ImportError: No module named foo42bar")
class ManageValidate(AdminScriptTestCase):
def tearDown(self):
Please sign in to comment.
Something went wrong with that request. Please try again.