refactor: remove xblockutils package

openedx/core/djangoapps/xblock/runtime/shims.py

@@ -141,7 +141,7 @@ class RuntimeShim:
         warnings.warn(
             "Use of runtime.render_template is deprecated. "
             "For template files included with your XBlock (which is preferable), use "
-            "xblockutils.resources.ResourceLoader.render_mako_template to render them, or use a JavaScript-based "
+            "xblock.utils.resources.ResourceLoader.render_mako_template to render them, or use a JavaScript-based "
             "template instead. For template files that are part of the LMS/Studio, use the 'mako' XBlock service.",
             DeprecationWarning, stacklevel=2,
         )

requirements/edx/kernel.in

@@ -158,5 +158,4 @@ user-util                           # Functionality for retiring users (GDPR com
 webob
 web-fragments                       # Provides the ability to render fragments of web pages
 XBlock[django]                      # Courseware component architecture
-xblock-utils                        # Provides utilities used by the Discussion XBlock
 xss-utils                           # https://github.com/edx/edx-platform/pull/20633 Fix XSS via Translations

xmodule/discussion_block.py

@@ -12,8 +12,8 @@ from web_fragments.fragment import Fragment
 from xblock.completable import XBlockCompletionMode
 from xblock.core import XBlock
 from xblock.fields import UNIQUE_ID, Scope, String
-from xblockutils.resources import ResourceLoader
-from xblockutils.studio_editable import StudioEditableXBlockMixin
+from xblock.utils.resources import ResourceLoader
+from xblock.utils.studio_editable import StudioEditableXBlockMixin
 
 from lms.djangoapps.discussion.django_comment_client.permissions import has_permission
 from openedx.core.djangoapps.discussions.models import DiscussionsConfiguration, Provider