From 248dae0021d1854b1181b3443fd5eceff4ea3e42 Mon Sep 17 00:00:00 2001 From: Ricky Rosario Date: Thu, 23 Jan 2014 15:06:40 -0500 Subject: [PATCH] [bug 963088] Fix deprecation warnings in manage.py --- manage.py | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/manage.py b/manage.py index 82bc0eb1706..01256aca36b 100755 --- a/manage.py +++ b/manage.py @@ -21,27 +21,14 @@ # Now we can import from third-party libraries. -from django.core.management import execute_manager, setup_environ - -try: - from kitsune import settings_local as settings -except ImportError: - try: - from kitsune import settings # Assumed to be in the same directory. - except ImportError: - sys.stderr.write( - "Error: Tried importing 'settings_local.py' and 'settings.py' " - "but neither could be found (or they're throwing an ImportError)." - " Please come back and try again later.") - raise - -# The first thing execute_manager does is call `setup_environ`. Logging config -# needs to access settings, so we'll setup the environ early. -setup_environ(settings) +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'kitsune.settings_local') +os.environ.setdefault('CELERY_CONFIG_MODULE', 'kitsune.settings_local') +from django.conf import settings # Import for side-effect: configures our logging handlers. from kitsune import log_settings if __name__ == "__main__": - execute_manager(settings) + from django.core.management import execute_from_command_line + execute_from_command_line(sys.argv)