Skip to content

Commit

Permalink
Remove everything from CMS/LMS startup.py except single monkey-patch.
Browse files Browse the repository at this point in the history
Move mimetype addition to common initialization.
  • Loading branch information
John Eskew committed Nov 8, 2017
1 parent e503ed8 commit 0279181
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 70 deletions.
21 changes: 1 addition & 20 deletions cms/startup.py
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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')
30 changes: 3 additions & 27 deletions lms/startup.py
Original file line number Diff line number Diff line change
@@ -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():
"""
Expand All @@ -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')
12 changes: 12 additions & 0 deletions openedx/core/djangoapps/common_initialization/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
23 changes: 0 additions & 23 deletions openedx/core/lib/django_startup.py

This file was deleted.

0 comments on commit 0279181

Please sign in to comment.