refactor: migrate from xblock-utils package to xblock.utils

openedx · Oct 26, 2023 · b4ead02 · b4ead02
1 parent 99f5f93
commit b4ead02
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/build/lib/sql_grader/xblocks.py b/build/lib/sql_grader/xblocks.py
@@ -2,8 +2,12 @@
 A custom submission type to evaluate SQL queries
 """
 from xblock.core import XBlock
-from xblockutils.resources import ResourceLoader
-from xblockutils.studio_editable import StudioEditableXBlockMixin
+try:
+    from xblock.utils.resources import ResourceLoader
+    from xblock.utils.studio_editable import StudioEditableXBlockMixin
+except ModuleNotFoundError:  # For backward compatibility with releases older than Quince.
+    from xblockutils.resources import ResourceLoader
+    from xblockutils.studio_editable import StudioEditableXBlockMixin
 
 from .mixins.dates import EnforceDueDates
 from .mixins.fragment import XBlockFragmentBuilderMixin

diff --git a/requirements/base.in b/requirements/base.in
@@ -3,6 +3,5 @@
 
 Django
 XBlock
-xblock-utils
 # TODO: Change this once codejail is published to pypi
 -e git+https://github.com/openedx/[email protected]#egg=codejail
diff --git a/sql_grader/xblocks.py b/sql_grader/xblocks.py
@@ -2,8 +2,13 @@
 A custom submission type to evaluate SQL queries
 """
 from xblock.core import XBlock
-from xblockutils.resources import ResourceLoader
-from xblockutils.studio_editable import StudioEditableXBlockMixin
+try:
+    from xblock.utils.resources import ResourceLoader
+    from xblock.utils.studio_editable import StudioEditableXBlockMixin
+except ModuleNotFoundError:
+    # For backward compatibility with releases older than Quince.
+    from xblockutils.resources import ResourceLoader
+    from xblockutils.studio_editable import StudioEditableXBlockMixin
 
 from .mixins.dates import EnforceDueDates
 from .mixins.fragment import XBlockFragmentBuilderMixin