refactor: remove xblockutils package

openedx · Oct 26, 2023 · b1cad2b · b1cad2b
1 parent fdd2cb4
commit b1cad2b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/google_drive/google_calendar.py b/google_drive/google_calendar.py
@@ -10,8 +10,12 @@
 from xblock.core import XBlock
 from xblock.fields import Integer, Scope, String
 from web_fragments.fragment import Fragment
-from xblockutils.publish_event import PublishEventMixin
-from xblockutils.resources import ResourceLoader
+try:
+    from xblock.utils.publish_event import PublishEventMixin
+    from xblock.utils.resources import ResourceLoader
+except ModuleNotFoundError:  # For backward compatibility with releases older than Quince.
+    from xblockutils.publish_event import PublishEventMixin
+    from xblockutils.resources import ResourceLoader
 
 LOG = logging.getLogger(__name__)
 RESOURCE_LOADER = ResourceLoader(__name__)

diff --git a/google_drive/google_docs.py b/google_drive/google_docs.py
@@ -11,8 +11,12 @@
 from xblock.core import XBlock
 from xblock.fields import Scope, String
 from web_fragments.fragment import Fragment
-from xblockutils.publish_event import PublishEventMixin
-from xblockutils.resources import ResourceLoader
+try:
+    from xblock.utils.publish_event import PublishEventMixin
+    from xblock.utils.resources import ResourceLoader
+except ModuleNotFoundError:  # For backward compatibility with releases older than Quince.
+    from xblockutils.publish_event import PublishEventMixin
+    from xblockutils.resources import ResourceLoader
 import six
 
 LOG = logging.getLogger(__name__)

diff --git a/requirements/base.in b/requirements/base.in
@@ -2,7 +2,5 @@
 -c constraints.txt
 
 Django                    # Web application framework
-mako                      # Used by xblock-utils.resources, but not declared as a requirement for it
 requests
 XBlock[django]            # Courseware component architecture
-xblock-utils