refactor: remove xblockutil

openedx · Oct 11, 2023 · e0f9fc4 · e0f9fc4
1 parent 68ff0c8
commit e0f9fc4
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 11 deletions.
diff --git a/drag_and_drop_v2/drag_and_drop_v2.py b/drag_and_drop_v2/drag_and_drop_v2.py
@@ -24,8 +24,8 @@
 from xblock.fields import Boolean, Dict, Float, Integer, Scope, String
 from xblock.scorable import ScorableXBlockMixin, Score
 from web_fragments.fragment import Fragment
-from xblockutils.resources import ResourceLoader
-from xblockutils.settings import ThemableXBlockMixin, XBlockWithSettingsMixin
+from xblock.utils.resources import ResourceLoader
+from xblock.utils.settings import ThemableXBlockMixin, XBlockWithSettingsMixin
 
 from .compat import get_grading_ignore_decoys_waffle_flag
 from .default_data import DEFAULT_DATA

diff --git a/requirements/base.in b/requirements/base.in
@@ -3,4 +3,3 @@
 
 django-statici18n
 bleach[css]
-xblock-utils
diff --git a/tests/integration/test_base.py b/tests/integration/test_base.py
@@ -15,8 +15,8 @@
 from selenium.webdriver.support.ui import WebDriverWait
 from six.moves import range
 from workbench import scenarios
-from xblockutils.base_test import SeleniumBaseTest
-from xblockutils.resources import ResourceLoader
+from xblock.utils.base_test import SeleniumBaseTest
+from xblock.utils.resources import ResourceLoader
 
 from drag_and_drop_v2.default_data import (BOTTOM_ZONE_ID, BOTTOM_ZONE_TITLE,
                                            DEFAULT_DATA, FINISH_FEEDBACK,

diff --git a/tests/integration/test_interaction.py b/tests/integration/test_interaction.py
@@ -13,7 +13,7 @@
 from selenium.webdriver import ActionChains
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support.ui import WebDriverWait
-from xblockutils.resources import ResourceLoader
+from xblock.utils.resources import ResourceLoader
 
 from tests.integration.test_base import (DefaultDataTestMixin,
                                          InteractionTestBase, ItemDefinition)

diff --git a/tests/integration/test_interaction_assessment.py b/tests/integration/test_interaction_assessment.py
@@ -15,7 +15,7 @@
 from selenium.common.exceptions import NoSuchElementException
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support.ui import WebDriverWait
-from xblockutils.resources import ResourceLoader
+from xblock.utils.resources import ResourceLoader
 
 from drag_and_drop_v2.default_data import (BOTTOM_ZONE_ID, DEFAULT_DATA, FINISH_FEEDBACK,
                                            MIDDLE_ZONE_ID, START_FEEDBACK,

diff --git a/tests/integration/test_render.py b/tests/integration/test_render.py
@@ -5,7 +5,7 @@
 from ddt import data, ddt, unpack
 from selenium.common.exceptions import NoSuchElementException
 from selenium.webdriver.common.keys import Keys
-from xblockutils.resources import ResourceLoader
+from xblock.utils.resources import ResourceLoader
 
 from drag_and_drop_v2.default_data import START_FEEDBACK
 

diff --git a/tests/integration/test_sizing.py b/tests/integration/test_sizing.py
@@ -6,7 +6,7 @@
 
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support.ui import WebDriverWait
-from xblockutils.resources import ResourceLoader
+from xblock.utils.resources import ResourceLoader
 
 from tests.integration.test_base import InteractionTestBase
 

diff --git a/tests/integration/test_studio.py b/tests/integration/test_studio.py
@@ -4,7 +4,7 @@
 
 import six
 from six.moves import range
-from xblockutils.studio_editable_test import StudioEditableBaseTest
+from xblock.utils.studio_editable_test import StudioEditableBaseTest
 
 
 class TestStudio(StudioEditableBaseTest):

diff --git a/tests/unit/test_fixtures.py b/tests/unit/test_fixtures.py
@@ -2,7 +2,7 @@
 
 import json
 
-from xblockutils.resources import ResourceLoader
+from xblock.utils.resources import ResourceLoader
 
 from tests.utils import TestCaseMixin, make_block