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/simple_with_draft/course.xml b/common/test/data/simple_with_draft/course.xml
index bf517cfb17..eef665c5b9 100644
--- a/common/test/data/simple_with_draft/course.xml
+++ b/common/test/data/simple_with_draft/course.xml
@@ -1,10 +1,10 @@
-
+
-
+
diff --git a/common/test/data/test_exam_registration/course/2012_Fall.xml b/common/test/data/test_exam_registration/course/2012_Fall.xml
index 9cd963ab63..a563152ace 100644
--- a/common/test/data/test_exam_registration/course/2012_Fall.xml
+++ b/common/test/data/test_exam_registration/course/2012_Fall.xml
@@ -1,9 +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 @@
-
+
-
+
diff --git a/common/test/data/test_import_course/policies/2012_Fall.json b/common/test/data/test_import_course/policies/2012_Fall.json
index 464184fac8..81aee0fa03 100644
--- a/common/test/data/test_import_course/policies/2012_Fall.json
+++ b/common/test/data/test_import_course/policies/2012_Fall.json
@@ -17,7 +17,7 @@
"chapter/Overview": {
"display_name": "Overview"
},
- "videosequence/Toy_Videos": {
+ "sequential/Toy_Videos": {
"display_name": "Toy Videos",
"format": "Lecture Sequence"
},
diff --git a/common/test/data/test_import_course_2/course/2014_Fall.xml b/common/test/data/test_import_course_2/course/2014_Fall.xml
index 9b14d49dcd..6781cbbe2d 100644
--- a/common/test/data/test_import_course_2/course/2014_Fall.xml
+++ b/common/test/data/test_import_course_2/course/2014_Fall.xml
@@ -1,14 +1,14 @@
-
+
-
+
diff --git a/common/test/data/test_import_course_2/policies/2012_Fall.json b/common/test/data/test_import_course_2/policies/2012_Fall.json
index 464184fac8..81aee0fa03 100644
--- a/common/test/data/test_import_course_2/policies/2012_Fall.json
+++ b/common/test/data/test_import_course_2/policies/2012_Fall.json
@@ -17,7 +17,7 @@
"chapter/Overview": {
"display_name": "Overview"
},
- "videosequence/Toy_Videos": {
+ "sequential/Toy_Videos": {
"display_name": "Toy Videos",
"format": "Lecture Sequence"
},
diff --git a/common/test/data/test_start_date/course/2012_Fall.xml b/common/test/data/test_start_date/course/2012_Fall.xml
index 9cd963ab63..afd51e97d1 100644
--- a/common/test/data/test_start_date/course/2012_Fall.xml
+++ b/common/test/data/test_start_date/course/2012_Fall.xml
@@ -1,9 +1,9 @@
-
+
-
+
diff --git a/common/test/data/test_start_date/policies/2012_Fall.json b/common/test/data/test_start_date/policies/2012_Fall.json
index a12ccecf1c..835c8f4b12 100644
--- a/common/test/data/test_start_date/policies/2012_Fall.json
+++ b/common/test/data/test_start_date/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/toy/course/2012_Fall.xml b/common/test/data/toy/course/2012_Fall.xml
index ace32483db..ac2a3682e9 100644
--- a/common/test/data/toy/course/2012_Fall.xml
+++ b/common/test/data/toy/course/2012_Fall.xml
@@ -1,7 +1,7 @@
-
+
@@ -11,7 +11,7 @@
-
+
diff --git a/common/test/data/toy/policies/2012_Fall.json b/common/test/data/toy/policies/2012_Fall.json
index d251cee109..49e3811255 100644
--- a/common/test/data/toy/policies/2012_Fall.json
+++ b/common/test/data/toy/policies/2012_Fall.json
@@ -26,7 +26,7 @@
"chapter/Overview": {
"display_name": "Overview"
},
- "videosequence/Toy_Videos": {
+ "sequential/Toy_Videos": {
"display_name": "Toy Videos",
"format": "Lecture Sequence"
},
diff --git a/common/test/data/two_toys/chapter/Overview.xml b/common/test/data/two_toys/chapter/Overview.xml
index a738a9eec3..c040ce8508 100644
--- a/common/test/data/two_toys/chapter/Overview.xml
+++ b/common/test/data/two_toys/chapter/Overview.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/common/test/data/two_toys/policies/TT_2012_Fall/policy.json b/common/test/data/two_toys/policies/TT_2012_Fall/policy.json
index 2831767b32..3a578598c9 100644
--- a/common/test/data/two_toys/policies/TT_2012_Fall/policy.json
+++ b/common/test/data/two_toys/policies/TT_2012_Fall/policy.json
@@ -7,7 +7,7 @@
"chapter/Overview": {
"display_name": "Two Toy Overview"
},
- "videosequence/Toy_Videos": {
+ "sequential/Toy_Videos": {
"display_name": "Toy Videos",
"format": "Lecture Sequence"
},
diff --git a/common/test/data/two_toys/videosequence/Toy_Videos.xml b/common/test/data/two_toys/videosequence/Toy_Videos.xml
index cf8b2defc5..714a9dc405 100644
--- a/common/test/data/two_toys/videosequence/Toy_Videos.xml
+++ b/common/test/data/two_toys/videosequence/Toy_Videos.xml
@@ -1,3 +1,3 @@
-
+
-
+
diff --git a/lms/djangoapps/courseware/management/commands/tests/test_dump_course.py b/lms/djangoapps/courseware/management/commands/tests/test_dump_course.py
index 92c0124156..18e29123b2 100644
--- a/lms/djangoapps/courseware/management/commands/tests/test_dump_course.py
+++ b/lms/djangoapps/courseware/management/commands/tests/test_dump_course.py
@@ -123,7 +123,7 @@ class CommandsTestBase(SharedModuleStoreTestCase):
assert len(dump[parent_id]['children']) == 3
child_id = dump[parent_id]['children'][1]
- assert dump[child_id]['category'] == 'videosequence'
+ assert dump[child_id]['category'] == 'sequential'
assert len(dump[child_id]['children']) == 2
video_id = str(test_course_key.make_usage_key('video', 'Welcome'))
@@ -195,7 +195,7 @@ class CommandsTestBase(SharedModuleStoreTestCase):
assert_in('edX-simple-2012_Fall', names)
assert_in(f'edX-simple-2012_Fall/policies/{self.url_name}/policy.json', names)
assert_in('edX-simple-2012_Fall/html/toylab.html', names)
- assert_in('edX-simple-2012_Fall/videosequence/A_simple_sequence.xml', names)
+ assert_in('edX-simple-2012_Fall/sequential/A_simple_sequence.xml', names)
assert_in('edX-simple-2012_Fall/sequential/Lecture_2.xml', names)
diff --git a/lms/djangoapps/courseware/tests/test_module_render.py b/lms/djangoapps/courseware/tests/test_module_render.py
index eeee3e7bfa..87f5f64a31 100644
--- a/lms/djangoapps/courseware/tests/test_module_render.py
+++ b/lms/djangoapps/courseware/tests/test_module_render.py
@@ -318,7 +318,7 @@ class ModuleRenderTestCase(SharedModuleStoreTestCase, LoginEnrollmentTestCase):
'xblock_handler',
args=[
str(self.course_key),
- quote_slashes(str(self.course_key.make_usage_key('videosequence', 'Toy_Videos'))),
+ quote_slashes(str(self.course_key.make_usage_key('sequential', 'Toy_Videos'))),
'xmodule_handler',
'goto_position'
]
@@ -1323,7 +1323,7 @@ class TestProctoringRendering(ModuleStoreTestCase):
Helper method to consolidate some courseware/proctoring/credit
test harness data
"""
- usage_key = self.course_key.make_usage_key('videosequence', 'Toy_Videos')
+ usage_key = self.course_key.make_usage_key('sequential', 'Toy_Videos')
with self.modulestore.bulk_operations(self.toy_course.id):
sequence = self.modulestore.get_item(usage_key)
diff --git a/lms/djangoapps/courseware/views/views.py b/lms/djangoapps/courseware/views/views.py
index 7a274e4784..0db5e27957 100644
--- a/lms/djangoapps/courseware/views/views.py
+++ b/lms/djangoapps/courseware/views/views.py
@@ -1671,7 +1671,7 @@ def enclosing_sequence_for_gating_checks(block):
all. LabXchange uses learning pathways, but even content inside courses like
`static_tab`, `book`, and `about` live outside the sequence hierarchy.
"""
- seq_tags = ['sequential', 'problemset', 'videosequence']
+ seq_tags = ['sequential']
# If it's being called on a Sequence itself, then don't bother crawling the
# ancestor tree, because all the sequence metadata we need for gating checks
diff --git a/lms/djangoapps/grades/tests/test_scores.py b/lms/djangoapps/grades/tests/test_scores.py
index 56340746d8..53aa4801b4 100644
--- a/lms/djangoapps/grades/tests/test_scores.py
+++ b/lms/djangoapps/grades/tests/test_scores.py
@@ -58,7 +58,7 @@ class TestScoredBlockTypes(TestCase):
'course', 'chapter', 'sequential', 'vertical',
'library_content', 'split_test', 'conditional', 'library', 'randomize',
'problem', 'drag-and-drop-v2', 'openassessment', 'lti', 'lti_consumer',
- 'videosequence', 'problemset', 'acid_parent', 'done', 'wrapper', 'edx_sga',
+ 'acid_parent', 'done', 'wrapper', 'edx_sga',
}
def test_block_types_possibly_scored(self):