diff --git a/cms/djangoapps/contentstore/outlines.py b/cms/djangoapps/contentstore/outlines.py index d88c4ff66e..72d5c4f257 100644 --- a/cms/djangoapps/contentstore/outlines.py +++ b/cms/djangoapps/contentstore/outlines.py @@ -245,9 +245,7 @@ def _make_section_data(section, unique_sequences): if error: section_errors.append(error) - # We haven't officially killed off problemset and videosequence yet, so - # treat them as equivalent to sequential for now. - valid_sequence_tags = ['sequential', 'problemset', 'videosequence'] + valid_sequence_tags = ['sequential'] sequences_data = [] for sequence in section.get_children(): diff --git a/cms/djangoapps/contentstore/tests/test_outlines.py b/cms/djangoapps/contentstore/tests/test_outlines.py index 9a0da6e9d5..b833ddaa55 100644 --- a/cms/djangoapps/contentstore/tests/test_outlines.py +++ b/cms/djangoapps/contentstore/tests/test_outlines.py @@ -232,12 +232,12 @@ class OutlineFromModuleStoreTestCase(ModuleStoreTestCase): ) ItemFactory.create( parent=section_1, - category='problemset', + category='sequential', display_name="pset_seq" ) ItemFactory.create( parent=section_1, - category='videosequence', + category='sequential', display_name="video_seq" ) diff --git a/common/lib/xmodule/setup.py b/common/lib/xmodule/setup.py index 281f8a1ec9..951a206404 100644 --- a/common/lib/xmodule/setup.py +++ b/common/lib/xmodule/setup.py @@ -24,7 +24,6 @@ XBLOCKS = [ "nonstaff_error = xmodule.error_module:NonStaffErrorBlock", "poll_question = xmodule.poll_module:PollBlock", "problem = xmodule.capa_module:ProblemBlock", - "problemset = xmodule.seq_module:SequenceBlock", "randomize = xmodule.randomize_module:RandomizeBlock", "sequential = xmodule.seq_module:SequenceBlock", "slides = xmodule.template_module:TranslateCustomTagBlock", @@ -35,7 +34,6 @@ XBLOCKS = [ "video = xmodule.video_module:VideoBlock", "videoalpha = xmodule.video_module:VideoBlock", "videodev = xmodule.template_module:TranslateCustomTagBlock", - "videosequence = xmodule.seq_module:SequenceBlock", "word_cloud = xmodule.word_cloud_module:WordCloudBlock", "wrapper = xmodule.wrapper_module:WrapperBlock", ] diff --git a/common/lib/xmodule/xmodule/modulestore/search.py b/common/lib/xmodule/xmodule/modulestore/search.py index 674a5a3169..136568eada 100644 --- a/common/lib/xmodule/xmodule/modulestore/search.py +++ b/common/lib/xmodule/xmodule/modulestore/search.py @@ -104,15 +104,15 @@ def path_to_location(modulestore, usage_key, request=None, full_path=False): # This block of code will find the position of a module within a nested tree # of modules. If a problem is on tab 2 of a sequence that's on tab 3 of a # sequence, the resulting position is 3_2. However, no positional modules - # (e.g. sequential and videosequence) currently deal with this form of - # representing nested positions. This needs to happen before jumping to a - # module nested in more than one positional module will work. + # (e.g. sequential) currently deal with this form of representing nested + # positions. This needs to happen before jumping to a module nested in more + # than one positional module will work. if n > 3: position_list = [] for path_index in range(2, n - 1): category = path[path_index].block_type - if category == 'sequential' or category == 'videosequence': # lint-amnesty, pylint: disable=consider-using-in + if category == 'sequential': section_desc = modulestore.get_item(path[path_index]) # this calls get_children rather than just children b/c old mongo includes private children # in children but not in get_children diff --git a/common/lib/xmodule/xmodule/modulestore/tests/sample_courses.py b/common/lib/xmodule/xmodule/modulestore/tests/sample_courses.py index a94f7834a9..04a56b82e1 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/sample_courses.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/sample_courses.py @@ -49,7 +49,7 @@ TOY_BLOCK_INFO_TREE = [ BlockInfo( 'Overview', "chapter", {"display_name": "Overview"}, [ BlockInfo( - "Toy_Videos", "videosequence", { + "Toy_Videos", "sequential", { "xml_attributes": {"filename": ["", None]}, "display_name": "Toy Videos", "format": "Lecture Sequence" # lint-amnesty, pylint: disable=line-too-long }, [ BlockInfo( diff --git a/common/lib/xmodule/xmodule/modulestore/xml.py b/common/lib/xmodule/xmodule/modulestore/xml.py index 8febae1623..d597c41f58 100644 --- a/common/lib/xmodule/xmodule/modulestore/xml.py +++ b/common/lib/xmodule/xmodule/modulestore/xml.py @@ -81,7 +81,7 @@ class ImportSystem(XMLParsingSystem, MakoDescriptorSystem): # lint-amnesty, pyl # tags that really need unique names--they store (or should store) state. need_uniq_names = ('problem', 'sequential', 'video', 'course', 'chapter', - 'videosequence', 'poll_question', 'vertical') + 'poll_question', 'vertical') attr = xml_data.attrib tag = xml_data.tag diff --git a/common/test/data/graded/course/2012_Fall.xml b/common/test/data/graded/course/2012_Fall.xml index e9735f9756..80ad524e2a 100644 --- a/common/test/data/graded/course/2012_Fall.xml +++ b/common/test/data/graded/course/2012_Fall.xml @@ -1,6 +1,6 @@ - + @@ -8,37 +8,37 @@ - + - + - + - + - + - + - - - + + + - + @@ -54,11 +54,11 @@ - - - + + + - + @@ -72,16 +72,16 @@ - + - - + + - + diff --git a/common/test/data/graded/policies/2012_Fall.json b/common/test/data/graded/policies/2012_Fall.json index 026d846b6c..aad4780817 100644 --- a/common/test/data/graded/policies/2012_Fall.json +++ b/common/test/data/graded/policies/2012_Fall.json @@ -5,44 +5,44 @@ "display_name": "Graded Course", "graded": "true" }, - - + + "vertical/Homework1": { - "display_name": "Homework 1", - "graded": true, - "format": "Homework" - }, - - - "videosequence/Homework2": { - "display_name": "Homework 2", - "graded": true, - "format": "Homework" - }, - - "problem/H2P1": { - "weight": 4 - }, - - "videosequence/Homework3": { - "display_name": "Homework 3", - "graded": true, + "display_name": "Homework 1", + "graded": true, "format": "Homework" }, - - "vertical/Homework1": { - "display_name": "Homework 1", - "graded": true, + + "sequential/Homework2": { + "display_name": "Homework 2", + "graded": true, "format": "Homework" }, - + + "problem/H2P1": { + "weight": 4 + }, + + "sequential/Homework3": { + "display_name": "Homework 3", + "graded": true, + "format": "Homework" + }, + + + "vertical/Homework1": { + "display_name": "Homework 1", + "graded": true, + "format": "Homework" + }, + "problem/FinalQuestion": { - "display_name": "Final Question", - "graded": true, + "display_name": "Final Question", + "graded": true, "format": "Final" }, - + "chapter/Overview": { "display_name": "Overview" } diff --git a/common/test/data/scoreable/course/course.xml b/common/test/data/scoreable/course/course.xml index 9d8e138a21..2b454c6973 100644 --- a/common/test/data/scoreable/course/course.xml +++ b/common/test/data/scoreable/course/course.xml @@ -1,4 +1,4 @@ - + diff --git a/common/test/data/scoreable/policies/course/policy.json b/common/test/data/scoreable/policies/course/policy.json index fd82e523ab..e177e5d444 100644 --- a/common/test/data/scoreable/policies/course/policy.json +++ b/common/test/data/scoreable/policies/course/policy.json @@ -9,8 +9,6 @@ "randomize", "drag-and-drop-v2", "library", - "videosequence", - "problemset", "acid_parent", "done", "wrapper", diff --git a/common/test/data/simple/course.xml b/common/test/data/simple/course.xml index 424d0f4a6c..aa64bf5762 100644 --- a/common/test/data/simple/course.xml +++ b/common/test/data/simple/course.xml @@ -1,10 +1,10 @@ diff --git a/common/test/data/test_exam_registration/policies/2012_Fall.json b/common/test/data/test_exam_registration/policies/2012_Fall.json index a12ccecf1c..835c8f4b12 100644 --- a/common/test/data/test_exam_registration/policies/2012_Fall.json +++ b/common/test/data/test_exam_registration/policies/2012_Fall.json @@ -11,7 +11,7 @@ "display_name": "Chapter 2", "start": "2015-07-17T12:00" }, - "videosequence/Toy_Videos": { + "sequential/Toy_Videos": { "display_name": "Toy Videos", "format": "Lecture Sequence" }, diff --git a/common/test/data/test_import_course/course/2012_Fall.xml b/common/test/data/test_import_course/course/2012_Fall.xml index 9b14d49dcd..6781cbbe2d 100644 --- a/common/test/data/test_import_course/course/2012_Fall.xml +++ b/common/test/data/test_import_course/course/2012_Fall.xml @@ -1,14 +1,14 @@ - + +