From ff17e51699f1eeed520545f004c29a9572570b01 Mon Sep 17 00:00:00 2001 From: farhan Date: Wed, 11 Oct 2023 11:31:23 +0500 Subject: [PATCH] refactor: remove xblockutils package --- openedx/core/djangoapps/xblock/runtime/shims.py | 2 +- requirements/edx/kernel.in | 1 - xmodule/discussion_block.py | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/openedx/core/djangoapps/xblock/runtime/shims.py b/openedx/core/djangoapps/xblock/runtime/shims.py index abef606bcf..18aa41eb91 100644 --- a/openedx/core/djangoapps/xblock/runtime/shims.py +++ b/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, ) diff --git a/requirements/edx/kernel.in b/requirements/edx/kernel.in index 18f4f87faa..1c727d2f9c 100644 --- a/requirements/edx/kernel.in +++ b/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 diff --git a/xmodule/discussion_block.py b/xmodule/discussion_block.py index b5c5c01907..943c6359dd 100644 --- a/xmodule/discussion_block.py +++ b/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