From 793df96332ffa2d9726c5b3e876455009ee98563 Mon Sep 17 00:00:00 2001
From: Kyle McCormick <kmccormick@edx.org>
Date: Wed, 30 Sep 2020 17:16:11 -0400
Subject: [PATCH] Declare CMS apps using fully qualified names

---
 cms/djangoapps/api/__init__.py        |  3 ++-
 cms/djangoapps/cms_user_tasks/apps.py |  2 +-
 cms/djangoapps/contentstore/apps.py   |  2 +-
 cms/djangoapps/xblock_config/apps.py  |  2 +-
 cms/envs/common.py                    | 10 +++++-----
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/cms/djangoapps/api/__init__.py b/cms/djangoapps/api/__init__.py
index 23ca7a69d04..2046a6c208d 100644
--- a/cms/djangoapps/api/__init__.py
+++ b/cms/djangoapps/api/__init__.py
@@ -1 +1,2 @@
-default_app_config = 'api.apps.ApiConfig'
+# pylint: disable=missing-module-docstring
+default_app_config = 'cms.djangoapps.api.apps.ApiConfig'
diff --git a/cms/djangoapps/cms_user_tasks/apps.py b/cms/djangoapps/cms_user_tasks/apps.py
index 6df4b7f953a..c8b3edb8991 100644
--- a/cms/djangoapps/cms_user_tasks/apps.py
+++ b/cms/djangoapps/cms_user_tasks/apps.py
@@ -11,7 +11,7 @@ class CmsUserTasksConfig(AppConfig):
     """
     Application Configuration for cms_user_tasks.
     """
-    name = u'cms_user_tasks'
+    name = u'cms.djangoapps.cms_user_tasks'
 
     def ready(self):
         """
diff --git a/cms/djangoapps/contentstore/apps.py b/cms/djangoapps/contentstore/apps.py
index 7f4bc6b37c3..d3a854f0057 100644
--- a/cms/djangoapps/contentstore/apps.py
+++ b/cms/djangoapps/contentstore/apps.py
@@ -12,7 +12,7 @@ class ContentstoreConfig(AppConfig):
     """
     Application Configuration for Contentstore.
     """
-    name = u'contentstore'
+    name = u'cms.djangoapps.contentstore'
 
     def ready(self):
         """
diff --git a/cms/djangoapps/xblock_config/apps.py b/cms/djangoapps/xblock_config/apps.py
index 13a910c7144..c5888443a29 100644
--- a/cms/djangoapps/xblock_config/apps.py
+++ b/cms/djangoapps/xblock_config/apps.py
@@ -13,7 +13,7 @@ class XBlockConfig(AppConfig):
     """
     Default configuration for the "xblock_config" Django application.
     """
-    name = u'xblock_config'
+    name = u'cms.djangoapps.xblock_config'
     verbose_name = u'XBlock Configuration'
 
     def ready(self):
diff --git a/cms/envs/common.py b/cms/envs/common.py
index 274d230394f..8d60122d5b0 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -1354,19 +1354,19 @@ INSTALLED_APPS = [
     'openedx.core.djangoapps.video_pipeline',
 
     # For CMS
-    'contentstore.apps.ContentstoreConfig',
+    'cms.djangoapps.contentstore.apps.ContentstoreConfig',
 
     'openedx.core.djangoapps.contentserver',
-    'course_creators',
+    'cms.djangoapps.course_creators',
     'student.apps.StudentConfig',  # misleading name due to sharing with lms
     'openedx.core.djangoapps.course_groups',  # not used in cms (yet), but tests run
-    'xblock_config.apps.XBlockConfig',
+    'cms.djangoapps.xblock_config.apps.XBlockConfig',
 
     # New (Blockstore-based) XBlock runtime
     'openedx.core.djangoapps.xblock.apps.StudioXBlockAppConfig',
 
     # Maintenance tools
-    'maintenance',
+    'cms.djangoapps.maintenance',
     'openedx.core.djangoapps.util.apps.UtilConfig',
 
     # Tracking
@@ -1478,7 +1478,7 @@ INSTALLED_APPS = [
     'user_tasks',
 
     # CMS specific user task handling
-    'cms_user_tasks.apps.CmsUserTasksConfig',
+    'cms.djangoapps.cms_user_tasks.apps.CmsUserTasksConfig',
 
     # Unusual migrations
     'database_fixups',
-- 
GitLab