From b805e19e3e549dfd05baa7de2ed5da4c543da47b Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 16 Feb 2020 17:34:25 +0100 Subject: Celery: fix extra_settings import --- example_project/celery_app.py.sample | 2 -- install/local_settings.py.sample | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/example_project/celery_app.py.sample b/example_project/celery_app.py.sample index 30ad27c78..81000bc14 100644 --- a/example_project/celery_app.py.sample +++ b/example_project/celery_app.py.sample @@ -1,6 +1,5 @@ import os from celery import Celery -import importlib # change example_project with your project name @@ -8,7 +7,6 @@ project_name = "example_project" # set the default Django settings module for the 'celery' program. os.environ.setdefault('DJANGO_SETTINGS_MODULE', project_name + '.settings') -importlib.import_module(project_name + '.settings') app = Celery(project_name) diff --git a/install/local_settings.py.sample b/install/local_settings.py.sample index aecad17a6..7c6bac348 100644 --- a/install/local_settings.py.sample +++ b/install/local_settings.py.sample @@ -39,4 +39,7 @@ DATABASES = { try: from extra_settings import * except ImportError as e: - print('Unable to load extra_settings.py:', e) + try: + from .extra_settings import * # relative import for celery + except ImportError as e: + print('Unable to load extra_settings.py:', e) -- cgit v1.2.3