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

Refs #26484 -- Avoided masking useful exceptions in manage.py's ImportError.

This commit is contained in:
Tim Graham 2016-04-09 13:24:45 -04:00
parent ad3c72118f
commit 5c6d397956
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
django/conf/project_template/manage.py-tpl
View File

@ -7,9 +7,16 @@ if __name__ == "__main__":
try: try:
from django.core.management import execute_from_command_line from django.core.management import execute_from_command_line
except ImportError: except ImportError:
raise ImportError( # The above import may fail for some other reason. Ensure that the
"Couldn't import Django. Are you sure it's installed and available " # issue is really that Django is missing to avoid masking other
"on your PATH environment variable? Did you forget to activate a " # exceptions on Python 2.
"virtual environment?" try:
) import django
except ImportError:
raise ImportError(
"Couldn't import Django. Are you sure it's installed and "
"available on your PYTHONPATH environment variable? Did you "
"forget to activate a virtual environment?"
)
raise
execute_from_command_line(sys.argv) execute_from_command_line(sys.argv)