Skip to content

Remove XModuleMixin legacy attibs from Poll and DiscussionBlock #38276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
salman2013 merged 2 commits into from
Apr 3, 2026
+7 −7
Merged

Remove XModuleMixin legacy attibs from Poll and DiscussionBlock #38276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78b7b4b
feat: Upgrade Python dependency xblocks-contrib
salman2013 Apr 2, 2026
3e1d43c
fix: fix poll block tests after removing legacy attributes
salman2013 Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1299,7 +1299,7 @@ xblock-utils==4.0.0
# via
# edx-sga
# xblock-poll
xblocks-contrib==0.15.2
xblocks-contrib==0.15.3
# via -r requirements/edx/bundled.in
xmlsec==1.3.14
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2326,7 +2326,7 @@ xblock-utils==4.0.0
# -r requirements/edx/testing.txt
# edx-sga
# xblock-poll
xblocks-contrib==0.15.2
xblocks-contrib==0.15.3
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/doc.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1637,7 +1637,7 @@ xblock-utils==4.0.0
# -r requirements/edx/base.txt
# edx-sga
# xblock-poll
xblocks-contrib==0.15.2
xblocks-contrib==0.15.3
# via -r requirements/edx/base.txt
xmlsec==1.3.14
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/testing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1732,7 +1732,7 @@ xblock-utils==4.0.0
# -r requirements/edx/base.txt
# edx-sga
# xblock-poll
xblocks-contrib==0.15.2
xblocks-contrib==0.15.3
# via -r requirements/edx/base.txt
xmlsec==1.3.14
# via
Expand Down
6 changes: 3 additions & 3 deletions xmodule/tests/test_poll.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ def setUp(self):
super().setUp()
course_key = CourseKey.from_string('org/course/run')
self.system = get_test_system(course_key)
usage_key = course_key.make_usage_key(self.poll_block_class.category, 'test_loc')
usage_key = course_key.make_usage_key('poll_question', 'test_loc')
# ScopeIds has 4 fields: user_id, block_type, def_id, usage_id
self.scope_ids = ScopeIds(1, self.poll_block_class.category, usage_key, usage_key)
self.scope_ids = ScopeIds(1, 'poll_question', usage_key, usage_key)
self.xblock = self.poll_block_class(
self.system, DictFieldData(self.raw_field_data), self.scope_ids
)
Expand Down Expand Up @@ -68,7 +68,7 @@ def test_poll_export_with_unescaped_characters_xml(self):
unescaped characters.
"""
module_system = DummyModuleStoreRuntime(load_error_blocks=True)
module_system.id_generator.target_course_id = self.xblock.course_id
module_system.id_generator.target_course_id = self.xblock.context_key
sample_poll_xml = '''
<poll_question display_name="Poll Question">
<p>How old are you?</p>
Expand Down
Loading