Merge pull request #16416 from edx/jeskew/edxmako_startup_py_remove

Move edxmako startup to AppConfig::ready.

cms/envs/common.py

@@ -966,7 +966,7 @@ INSTALLED_APPS = [
     'openedx.core.djangoapps.datadog',
 
     # For asset pipelining
-    'edxmako',
+    'edxmako.apps.EdxMakoConfig',
     'pipeline',
     'static_replace',
     'require',

common/djangoapps/edxmako/startup.py → common/djangoapps/edxmako/apps.py

-"""
-Initialize the mako template lookup
-"""
-from django.conf import settings
 
+from django.apps import AppConfig
+from django.conf import settings
 from . import add_lookup, clear_lookups
 
 
-def run():
-    """
-    Setup mako lookup directories.
+class EdxMakoConfig(AppConfig):
+    name = 'edxmako'
+    verbose_name = "edX Mako Templating"
+
+    def ready(self):
+        """
+        Setup mako lookup directories.
 
-    IMPORTANT: This method can be called multiple times during application startup. Any changes to this method
-    must be safe for multiple callers during startup phase.
-    """
-    template_locations = settings.MAKO_TEMPLATES
-    for namespace, directories in template_locations.items():
-        clear_lookups(namespace)
-        for directory in directories:
-            add_lookup(namespace, directory)
+        IMPORTANT: This method can be called multiple times during application startup. Any changes to this method
+        must be safe for multiple callers during startup phase.
+        """
+        template_locations = settings.MAKO_TEMPLATES
+        for namespace, directories in template_locations.items():
+            clear_lookups(namespace)
+            for directory in directories:
+                add_lookup(namespace, directory)

lms/envs/common.py

@@ -2040,7 +2040,7 @@ INSTALLED_APPS = [
     'status',
 
     # For asset pipelining
-    'edxmako',
+    'edxmako.apps.EdxMakoConfig',
     'pipeline',
     'static_replace',
     'webpack_loader',