diff --git a/cms/startup.py b/cms/startup.py index bc336110e2..ca1c37074a 100644 --- a/cms/startup.py +++ b/cms/startup.py @@ -1,12 +1,11 @@ """ -Module with code executed during Studio startup +Module for code that should run during Studio startup (deprecated) """ import django from django.conf import settings from openedx.core.djangoapps.monkey_patch import django_db_models_options -from openedx.core.lib.django_startup import autostartup # Force settings to run so that the python path is modified @@ -23,21 +22,3 @@ def run(): django_db_models_options.patch() django.setup() - - autostartup() - - add_mimetypes() - - -def add_mimetypes(): - """ - Add extra mimetypes. Used in xblock_resource. - - If you add a mimetype here, be sure to also add it in lms/startup.py. - """ - import mimetypes - - mimetypes.add_type('application/vnd.ms-fontobject', '.eot') - mimetypes.add_type('application/x-font-opentype', '.otf') - mimetypes.add_type('application/x-font-ttf', '.ttf') - mimetypes.add_type('application/font-woff', '.woff') diff --git a/lms/startup.py b/lms/startup.py index 2fe0fc6013..49a8ff293b 100644 --- a/lms/startup.py +++ b/lms/startup.py @@ -1,22 +1,16 @@ """ -Module for code that should run during LMS startup +Module for code that should run during LMS startup (deprecated) """ -import logging - import django from django.conf import settings +from openedx.core.djangoapps.monkey_patch import django_db_models_options + # Force settings to run so that the python path is modified settings.INSTALLED_APPS # pylint: disable=pointless-statement -from openedx.core.lib.django_startup import autostartup - -from openedx.core.djangoapps.monkey_patch import django_db_models_options - -log = logging.getLogger(__name__) - def run(): """ @@ -28,21 +22,3 @@ def run(): django_db_models_options.patch() django.setup() - - autostartup() - - add_mimetypes() - - -def add_mimetypes(): - """ - Add extra mimetypes. Used in xblock_resource. - - If you add a mimetype here, be sure to also add it in cms/startup.py. - """ - import mimetypes - - mimetypes.add_type('application/vnd.ms-fontobject', '.eot') - mimetypes.add_type('application/x-font-opentype', '.otf') - mimetypes.add_type('application/x-font-ttf', '.ttf') - mimetypes.add_type('application/font-woff', '.woff') diff --git a/openedx/core/djangoapps/common_initialization/apps.py b/openedx/core/djangoapps/common_initialization/apps.py index 5749a91b88..e404068127 100644 --- a/openedx/core/djangoapps/common_initialization/apps.py +++ b/openedx/core/djangoapps/common_initialization/apps.py @@ -12,3 +12,15 @@ class CommonInitializationConfig(AppConfig): def ready(self): # Common settings validations for the LMS and CMS. from . import checks + self._add_mimetypes() + + def _add_mimetypes(self): + """ + Add extra mimetypes. Used in xblock_resource. + """ + import mimetypes + + mimetypes.add_type('application/vnd.ms-fontobject', '.eot') + mimetypes.add_type('application/x-font-opentype', '.otf') + mimetypes.add_type('application/x-font-ttf', '.ttf') + mimetypes.add_type('application/font-woff', '.woff') diff --git a/openedx/core/lib/django_startup.py b/openedx/core/lib/django_startup.py deleted file mode 100644 index 675ca2a64c..0000000000 --- a/openedx/core/lib/django_startup.py +++ /dev/null @@ -1,23 +0,0 @@ -""" -Automatic execution of startup modules in Django apps. -""" - -from importlib import import_module - -from django.conf import settings - - -def autostartup(): - """ - Execute app.startup:run() for all installed django apps - """ - for app in settings.INSTALLED_APPS: - # See if there's a startup module in each app. - try: - mod = import_module(app + '.startup') - except ImportError: - continue - - # If the module has a run method, run it. - if hasattr(mod, 'run'): - mod.run()