From d79220122c2b5c743a49e21e60d76677f2b5e605 Mon Sep 17 00:00:00 2001 From: Don Mitchell Date: Thu, 26 Sep 2013 11:27:29 -0400 Subject: [PATCH] Change DescriptionLocator to DefinitionLocator --- common/lib/xmodule/xmodule/modulestore/locator.py | 2 +- .../modulestore/split_mongo/definition_lazy_loader.py | 4 ++-- .../lib/xmodule/xmodule/modulestore/split_mongo/split.py | 8 ++++---- .../xmodule/xmodule/modulestore/tests/test_locators.py | 6 +++--- .../xmodule/modulestore/tests/test_split_modulestore.py | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/common/lib/xmodule/xmodule/modulestore/locator.py b/common/lib/xmodule/xmodule/modulestore/locator.py index 097f69c7c2..47753a4941 100644 --- a/common/lib/xmodule/xmodule/modulestore/locator.py +++ b/common/lib/xmodule/xmodule/modulestore/locator.py @@ -424,7 +424,7 @@ class BlockUsageLocator(CourseLocator): return rep + BLOCK_PREFIX + unicode(self.usage_id) -class DescriptionLocator(Locator): +class DefinitionLocator(Locator): """ Container for how to locate a description (the course-independent content). """ diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/definition_lazy_loader.py b/common/lib/xmodule/xmodule/modulestore/split_mongo/definition_lazy_loader.py index 5ccaaa7ed3..9b2a652a95 100644 --- a/common/lib/xmodule/xmodule/modulestore/split_mongo/definition_lazy_loader.py +++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/definition_lazy_loader.py @@ -1,4 +1,4 @@ -from xmodule.modulestore.locator import DescriptionLocator +from xmodule.modulestore.locator import DefinitionLocator class DefinitionLazyLoader(object): @@ -15,7 +15,7 @@ class DefinitionLazyLoader(object): :param definition_locator: the id of the record in the above to fetch """ self.modulestore = modulestore - self.definition_locator = DescriptionLocator(definition_id) + self.definition_locator = DefinitionLocator(definition_id) def fetch(self): """ diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py b/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py index 60bfa66b6a..cdcb55d899 100644 --- a/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py +++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py @@ -11,7 +11,7 @@ from pytz import UTC from xmodule.errortracker import null_error_tracker from xmodule.x_module import XModuleDescriptor -from xmodule.modulestore.locator import BlockUsageLocator, DescriptionLocator, CourseLocator, VersionTree, LocalId +from xmodule.modulestore.locator import BlockUsageLocator, DefinitionLocator, CourseLocator, VersionTree, LocalId from xmodule.modulestore.exceptions import InsufficientSpecificationError, VersionConflictError, DuplicateItemError from xmodule.modulestore import inheritance, ModuleStoreBase, Location @@ -563,7 +563,7 @@ class SplitMongoModuleStore(ModuleStoreBase): } } new_id = self.definitions.insert(document) - definition_locator = DescriptionLocator(new_id) + definition_locator = DefinitionLocator(new_id) document['edit_info']['original_version'] = new_id self.definitions.update({'_id': new_id}, {'$set': {"edit_info.original_version": new_id}}) return definition_locator @@ -597,7 +597,7 @@ class SplitMongoModuleStore(ModuleStoreBase): old_definition['edit_info']['edited_on'] = datetime.datetime.now(UTC) old_definition['edit_info']['previous_version'] = definition_locator.definition_id new_id = self.definitions.insert(old_definition) - return DescriptionLocator(new_id), True + return DefinitionLocator(new_id), True else: return definition_locator, False @@ -1252,7 +1252,7 @@ class SplitMongoModuleStore(ModuleStoreBase): elif '_id' not in definition: return None else: - return DescriptionLocator(definition['_id']) + return DefinitionLocator(definition['_id']) def internal_clean_children(self, course_locator): """ diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_locators.py b/common/lib/xmodule/xmodule/modulestore/tests/test_locators.py index 330a2b7320..6ec9acfcd5 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_locators.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_locators.py @@ -4,7 +4,7 @@ Tests for xmodule.modulestore.locator. from unittest import TestCase from bson.objectid import ObjectId -from xmodule.modulestore.locator import Locator, CourseLocator, BlockUsageLocator, DescriptionLocator +from xmodule.modulestore.locator import Locator, CourseLocator, BlockUsageLocator, DefinitionLocator from xmodule.modulestore.parsers import BRANCH_PREFIX, BLOCK_PREFIX, VERSION_PREFIX, URL_VERSION_PREFIX from xmodule.modulestore.exceptions import InsufficientSpecificationError, OverSpecificationError @@ -254,11 +254,11 @@ class LocatorTest(TestCase): self.assertEqual('BlockUsageLocator("mit.eecs.6002x/branch/published/block/HW3")', repr(testobj)) def test_description_locator_url(self): - definition_locator = DescriptionLocator("chapter12345_2") + definition_locator = DefinitionLocator("chapter12345_2") self.assertEqual('edx://' + URL_VERSION_PREFIX + 'chapter12345_2', definition_locator.url()) def test_description_locator_version(self): - definition_locator = DescriptionLocator("chapter12345_2") + definition_locator = DefinitionLocator("chapter12345_2") self.assertEqual("chapter12345_2", definition_locator.version()) # ------------------------------------------------------------------ diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py b/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py index be5c61a143..2373c409de 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py @@ -13,7 +13,7 @@ from xblock.fields import Scope from xmodule.course_module import CourseDescriptor from xmodule.modulestore.exceptions import InsufficientSpecificationError, ItemNotFoundError, VersionConflictError, \ DuplicateItemError -from xmodule.modulestore.locator import CourseLocator, BlockUsageLocator, VersionTree, DescriptionLocator +from xmodule.modulestore.locator import CourseLocator, BlockUsageLocator, VersionTree, DefinitionLocator from xmodule.modulestore.inheritance import InheritanceMixin from xmodule.x_module import XModuleMixin from pytz import UTC @@ -562,7 +562,7 @@ class TestItemCrud(SplitModuleTest): new_module = modulestore().create_item( locator, category, 'user123', fields={'display_name': 'new chapter'}, - definition_locator=DescriptionLocator("chapter12345_2") + definition_locator=DefinitionLocator("chapter12345_2") ) # check that course version changed and course's previous is the other one self.assertNotEqual(new_module.location.version_guid, premod_course.location.version_guid) @@ -588,7 +588,7 @@ class TestItemCrud(SplitModuleTest): another_module = modulestore().create_item( locator, category, 'anotheruser', fields={'display_name': 'problem 2', 'data': another_payload}, - definition_locator=DescriptionLocator("problem12345_3_1"), + definition_locator=DefinitionLocator("problem12345_3_1"), ) # check that course version changed and course's previous is the other one parent = modulestore().get_item(locator) @@ -789,7 +789,7 @@ class TestItemCrud(SplitModuleTest): modulestore().create_item( locator, category, 'test_update_manifold', fields={'display_name': 'problem 2', 'data': another_payload}, - definition_locator=DescriptionLocator("problem12345_3_1"), + definition_locator=DefinitionLocator("problem12345_3_1"), ) # pylint: disable=W0212 modulestore()._clear_cache()