DETACHED_CATEGORIES renamed to DETACHED_XBLOCK_TYPES

common/lib/xmodule/xmodule/modulestore/mongo/base.py

@@ -51,7 +51,7 @@
 from xmodule.modulestore.exceptions import ItemNotFoundError, DuplicateCourseError, ReferentialIntegrityError
 from xmodule.modulestore.inheritance import InheritanceMixin, inherit_metadata, InheritanceKeyValueStore
 from xmodule.modulestore.xml import CourseLocationManager
-from xmodule.modulestore.store_utilities import DETACHED_CATEGORIES
+from xmodule.modulestore.store_utilities import DETACHED_XBLOCK_TYPES
 from xmodule.services import SettingsService
 
 log = logging.getLogger(__name__)
@@ -268,7 +268,7 @@ def load_item(self, location, for_parent=None):  # pylint: disable=method-hidden
                     )
                     if parent_url:
                         parent = self._convert_reference_to_key(parent_url)
-                if not parent and category not in DETACHED_CATEGORIES + ['course']:
+                if not parent and category not in DETACHED_XBLOCK_TYPES + ['course']:
                     # try looking it up just-in-time (but not if we're working with a detached block).
                     parent = self.modulestore.get_parent_location(
                         as_published(location),
@@ -964,7 +964,7 @@ def _should_apply_cached_metadata(self, item, depth):
         of inherited metadata onto the item
         """
         category = item['location']['category']
-        apply_cached_metadata = category not in DETACHED_CATEGORIES and \
+        apply_cached_metadata = category not in DETACHED_XBLOCK_TYPES and \
             not (category == 'course' and depth == 0)
         return apply_cached_metadata
 

common/lib/xmodule/xmodule/modulestore/split_mongo/split.py

@@ -83,7 +83,7 @@
 from .caching_descriptor_system import CachingDescriptorSystem
 from xmodule.modulestore.split_mongo.mongo_connection import MongoConnection, DuplicateKeyError
 from xmodule.modulestore.split_mongo import BlockKey, CourseEnvelope
-from xmodule.modulestore.store_utilities import DETACHED_CATEGORIES
+from xmodule.modulestore.store_utilities import DETACHED_XBLOCK_TYPES
 from xmodule.error_module import ErrorDescriptor
 from collections import defaultdict
 from types import NoneType
@@ -1204,7 +1204,7 @@ def _block_matches_all(block_data):
         for block_id, value in course.structure['blocks'].iteritems():
             if _block_matches_all(value):
                 if not include_orphans:
-                    if block_id.type in DETACHED_CATEGORIES or self.has_path_to_root(block_id, course):
+                    if block_id.type in DETACHED_XBLOCK_TYPES or self.has_path_to_root(block_id, course):
                         items.append(block_id)
                 else:
                     items.append(block_id)

common/lib/xmodule/xmodule/modulestore/store_utilities.py

@@ -5,7 +5,7 @@
 import uuid
 from xblock.core import XBlock
 
-DETACHED_CATEGORIES = [name for name, __ in XBlock.load_tagged_classes("detached")]
+DETACHED_XBLOCK_TYPES = [name for name, __ in XBlock.load_tagged_classes("detached")]
 
 
 def _prefix_only_url_replace_regex(pattern):

common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py

@@ -42,7 +42,7 @@
 from xmodule.modulestore.exceptions import ItemNotFoundError, DuplicateCourseError, ReferentialIntegrityError, NoPathToItem
 from xmodule.modulestore.mixed import MixedModuleStore
 from xmodule.modulestore.search import path_to_location, navigation_index
-from xmodule.modulestore.store_utilities import DETACHED_CATEGORIES
+from xmodule.modulestore.store_utilities import DETACHED_XBLOCK_TYPES
 from xmodule.modulestore.tests.factories import check_mongo_calls, check_exact_number_of_calls, \
     mongo_uses_error_check
 from xmodule.modulestore.tests.utils import create_modulestore_instance, LocationMixin, mock_tab_from_json
@@ -468,7 +468,7 @@ def test_get_items_include_orphans(self, default_ms, expected_items_in_tree, orp
         # Assert that about is a detached category found in get_items
         self.assertIn(
             [item.location.block_type for item in items if item.location.block_type == 'about'][0],
-            DETACHED_CATEGORIES
+            DETACHED_XBLOCK_TYPES
         )
         self.assertEqual(len(items), 2)