From 4f9bb8b1617b97dcb57a1ab01aeefa1de7521eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 19 Jan 2020 19:04:15 +0100 Subject: [PATCH] python3: use exec(open(... to replace execfile (#39092) --- debian/debian_config.py | 8 ++++---- debian/settings.py | 3 ++- welco/settings.py | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/debian_config.py b/debian/debian_config.py index 9d91f2c..34cf33f 100644 --- a/debian/debian_config.py +++ b/debian/debian_config.py @@ -1,4 +1,4 @@ -# This file is sourced by "execfile" from welco.settings +# This file is sourced by "exec(open(..." from welco.settings import os @@ -10,12 +10,12 @@ INSTALLED_APPS += ('mellon',) # # hobotization (multitenant) # -execfile('/usr/lib/hobo/debian_config_common.py') +exec(open('/usr/lib/hobo/debian_config_common.py').read()) # # local settings # -execfile(os.path.join(ETC_DIR, 'settings.py')) +exec(open(os.path.join(ETC_DIR, 'settings.py')).read()) # run additional settings snippets -execfile('/usr/lib/hobo/debian_config_settings_d.py') +exec(open('/usr/lib/hobo/debian_config_settings_d.py').read()) diff --git a/debian/settings.py b/debian/settings.py index 42779e4..a7a2c6f 100644 --- a/debian/settings.py +++ b/debian/settings.py @@ -9,7 +9,8 @@ # WARNING! Quick-start development settings unsuitable for production! # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/ -# This file is sourced by "execfile" from /usr/lib/welco/debian_config.py +# This file is sourced by "exec(open(...).read())" from +# /usr/lib/welco/debian_config.py # SECURITY WARNING: don't run with debug turned on in production! DEBUG = False diff --git a/welco/settings.py b/welco/settings.py index f5643f6..2a3ac3b 100644 --- a/welco/settings.py +++ b/welco/settings.py @@ -220,4 +220,4 @@ REST_FRAMEWORK['DEFAULT_AUTHENTICATION_CLASSES'] = ['rest_framework.authenticati local_settings_file = os.environ.get('WELCO_SETTINGS_FILE', os.path.join(os.path.dirname(__file__), 'local_settings.py')) if os.path.exists(local_settings_file): - execfile(local_settings_file) + exec(open(local_settings_file).read())