manage.py: Clean up imports a bit.

Import at fewer separate places in the code, and without duplication.
This commit is contained in:
Greg Price 2017-08-18 13:23:46 -07:00 committed by Tim Abbott
parent f73e898874
commit 598acd1f34
1 changed files with 5 additions and 8 deletions

View File

@ -10,23 +10,20 @@ sys.path.append(BASE_DIR)
import scripts.lib.setup_path_on_import import scripts.lib.setup_path_on_import
if __name__ == "__main__": if __name__ == "__main__":
if 'posix' in os.name and os.geteuid() == 0:
from django.core.management.base import CommandError
raise CommandError("manage.py should not be run as root. Use `su zulip` to drop root.")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "zproject.settings") os.environ.setdefault("DJANGO_SETTINGS_MODULE", "zproject.settings")
os.environ.setdefault("PYTHONSTARTUP", os.path.join(BASE_DIR, "scripts/lib/pythonrc.py"))
from django.conf import settings from django.conf import settings
from django.core.management import execute_from_command_line
from django.core.management.base import CommandError from django.core.management.base import CommandError
from scripts.lib.zulip_tools import log_management_command from scripts.lib.zulip_tools import log_management_command
if 'posix' in os.name and os.geteuid() == 0:
raise CommandError("manage.py should not be run as root. Use `su zulip` to drop root.")
log_management_command(" ".join(sys.argv), settings.MANAGEMENT_LOG_PATH) log_management_command(" ".join(sys.argv), settings.MANAGEMENT_LOG_PATH)
os.environ.setdefault("PYTHONSTARTUP", os.path.join(BASE_DIR, "scripts/lib/pythonrc.py"))
if "--no-traceback" not in sys.argv and len(sys.argv) > 1: if "--no-traceback" not in sys.argv and len(sys.argv) > 1:
sys.argv.append("--traceback") sys.argv.append("--traceback")
from django.core.management import execute_from_command_line
try: try:
execute_from_command_line(sys.argv) execute_from_command_line(sys.argv)
except CommandError as e: except CommandError as e: