Move django_comment_client to discussion/

alangsto · May 3, 2019 · e160b23 · e160b23
1 parent b949452
commit e160b23
Show file tree

Hide file tree

Showing 67 changed files with 100 additions and 81 deletions.
diff --git a/common/djangoapps/django_comment_common/models.py b/common/djangoapps/django_comment_common/models.py
@@ -78,7 +78,7 @@ class Role(models.Model):
     course_id = CourseKeyField(max_length=255, blank=True, db_index=True)
 
     class Meta(object):
-        # use existing table that was originally created from django_comment_client app
+        # use existing table that was originally created from lms.djangoapps.discussion.django_comment_client app
         db_table = 'django_comment_client_role'
 
     def __unicode__(self):
@@ -134,7 +134,7 @@ class Permission(models.Model):
     roles = models.ManyToManyField(Role, related_name="permissions")
 
     class Meta(object):
-        # use existing table that was originally created from django_comment_client app
+        # use existing table that was originally created from lms.djangoapps.discussion.django_comment_client app
         db_table = 'django_comment_client_permission'
 
     def __unicode__(self):

diff --git a/lms/djangoapps/ccx/tests/test_views.py b/lms/djangoapps/ccx/tests/test_views.py
@@ -23,7 +23,7 @@
 from courseware.tests.factories import StudentModuleFactory
 from courseware.tests.helpers import LoginEnrollmentTestCase
 from courseware.testutils import FieldOverrideTestMixin
-from django_comment_client.utils import has_forum_access
+from lms.djangoapps.discussion.django_comment_client.utils import has_forum_access
 from django_comment_common.models import FORUM_ROLE_ADMINISTRATOR
 from django_comment_common.utils import are_permissions_roles_seeded
 from edx_django_utils.cache import RequestCache

diff --git a/lms/djangoapps/courseware/tests/test_discussion_xblock.py b/lms/djangoapps/courseware/tests/test_discussion_xblock.py
@@ -213,7 +213,10 @@ def test_has_permission(self):
         Test for has_permission method.
         """
         permission_canary = object()
-        with mock.patch('django_comment_client.permissions.has_permission', return_value=permission_canary) as has_perm:
+        with mock.patch(
+            'lms.djangoapps.discussion.django_comment_client.permissions.has_permission',
+            return_value=permission_canary,
+        ) as has_perm:
             actual_permission = self.block.has_permission("test_permission")
         self.assertEqual(actual_permission, permission_canary)
         has_perm.assert_called_once_with(self.django_user_canary, 'test_permission', 'test_course')

diff --git a/lms/djangoapps/discussion/README.rst b/lms/djangoapps/discussion/README.rst
@@ -10,7 +10,6 @@ Discussions related functionality is scattered across a number of places and sho
 
 * ``common/djangoapps/django_comment_common``
 * ``lms/djangoapps/discussion``
-* ``lms/djangoapps/django_comment_client``
 * ``lms/djangoapps/notification_prefs``
 * ``lms/djangoapps/notifier_api``
 * ``openedx/core/lib/xblock_builtin/xblock_discussion``

diff --git a/...angoapps/django_comment_client/README.rst → ...scussion/django_comment_client/README.rst b/...angoapps/django_comment_client/README.rst → ...scussion/django_comment_client/README.rst
diff --git a/...ngoapps/django_comment_client/__init__.py → ...cussion/django_comment_client/__init__.py b/...ngoapps/django_comment_client/__init__.py → ...cussion/django_comment_client/__init__.py
diff --git a/...ps/django_comment_client/base/__init__.py → ...on/django_comment_client/base/__init__.py b/...ps/django_comment_client/base/__init__.py → ...on/django_comment_client/base/__init__.py
diff --git a/...comment_client/base/event_transformers.py → ...comment_client/base/event_transformers.py b/...comment_client/base/event_transformers.py → ...comment_client/base/event_transformers.py
@@ -8,9 +8,9 @@
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.locator import CourseLocator
 
-from django_comment_client.base.views import add_truncated_title_to_event_data
-from django_comment_client.permissions import get_team
-from django_comment_client.utils import get_cached_discussion_id_map_by_course_id
+from lms.djangoapps.discussion.django_comment_client.base.views import add_truncated_title_to_event_data
+from lms.djangoapps.discussion.django_comment_client.permissions import get_team
+from lms.djangoapps.discussion.django_comment_client.utils import get_cached_discussion_id_map_by_course_id
 from track.transformers import EventTransformer, EventTransformerRegistry
 from track.views.segmentio import (
     BI_SCREEN_VIEWED_EVENT_NAME,

diff --git a/...oapps/django_comment_client/base/tests.py → ...ssion/django_comment_client/base/tests.py b/...oapps/django_comment_client/base/tests.py → ...ssion/django_comment_client/base/tests.py
@@ -18,14 +18,14 @@
 from common.test.utils import MockSignalHandlerMixin, disable_signal
 from course_modes.models import CourseMode
 from course_modes.tests.factories import CourseModeFactory
-from django_comment_client.base import views
-from django_comment_client.tests.group_id import (
+from lms.djangoapps.discussion.django_comment_client.base import views
+from lms.djangoapps.discussion.django_comment_client.tests.group_id import (
     CohortedTopicGroupIdTestMixin,
     GroupIdAssertionMixin,
     NonCohortedTopicGroupIdTestMixin
 )
-from django_comment_client.tests.unicode import UnicodeTestMixin
-from django_comment_client.tests.utils import CohortedTestCase, ForumsEnableMixin
+from lms.djangoapps.discussion.django_comment_client.tests.unicode import UnicodeTestMixin
+from lms.djangoapps.discussion.django_comment_client.tests.utils import CohortedTestCase, ForumsEnableMixin
 from django_comment_common.comment_client import Thread
 from django_comment_common.models import (
     assign_role,
@@ -641,7 +641,10 @@ def test_update_thread_course_topic(self, mock_request):
         with self.assert_discussion_signals('thread_edited'):
             self.update_thread_helper(mock_request)
 
-    @patch('django_comment_client.utils.get_discussion_categories_ids', return_value=["test_commentable"])
+    @patch(
+        'lms.djangoapps.discussion.django_comment_client.utils.get_discussion_categories_ids',
+        return_value=["test_commentable"],
+    )
     def test_update_thread_wrong_commentable_id(self, mock_get_discussion_id_map, mock_request):
         self._test_request_error(
             "update_thread",
@@ -1233,7 +1236,10 @@ def setUpTestData(cls):
         cls.student = UserFactory.create()
         CourseEnrollmentFactory(user=cls.student, course_id=cls.course.id)
 
-    @patch('django_comment_client.utils.get_discussion_categories_ids', return_value=["test_commentable"])
+    @patch(
+        'lms.djangoapps.discussion.django_comment_client.utils.get_discussion_categories_ids',
+        return_value=["test_commentable"],
+    )
     @patch('django_comment_common.comment_client.utils.requests.request', autospec=True)
     def _test_unicode_data(self, text, mock_request, mock_get_discussion_id_map):
         self._set_mock_request_data(mock_request, {

diff --git a/...goapps/django_comment_client/base/urls.py → ...ussion/django_comment_client/base/urls.py b/...goapps/django_comment_client/base/urls.py → ...ussion/django_comment_client/base/urls.py
@@ -3,7 +3,7 @@
 """
 from django.conf.urls import url
 
-from django_comment_client.base import views
+from lms.djangoapps.discussion.django_comment_client.base import views
 
 urlpatterns = [
     url(r'^upload$', views.upload, name='upload'),

diff --git a/...oapps/django_comment_client/base/views.py → ...ssion/django_comment_client/base/views.py b/...oapps/django_comment_client/base/views.py → ...ssion/django_comment_client/base/views.py
@@ -20,12 +20,12 @@
 from opaque_keys.edx.keys import CourseKey
 from six import text_type
 
-import django_comment_client.settings as cc_settings
+import lms.djangoapps.discussion.django_comment_client.settings as cc_settings
 import django_comment_common.comment_client as cc
 from courseware.access import has_access
 from courseware.courses import get_course_by_id, get_course_overview_with_access, get_course_with_access
-from django_comment_client.permissions import check_permissions_by_view, get_team, has_permission
-from django_comment_client.utils import (
+from lms.djangoapps.discussion.django_comment_client.permissions import check_permissions_by_view, get_team, has_permission
+from lms.djangoapps.discussion.django_comment_client.utils import (
     JsonError,
     JsonResponse,
     add_courseware_context,

diff --git a/...goapps/django_comment_client/constants.py → ...ussion/django_comment_client/constants.py b/...goapps/django_comment_client/constants.py → ...ussion/django_comment_client/constants.py
diff --git a/...oapps/django_comment_client/middleware.py → ...ssion/django_comment_client/middleware.py b/...oapps/django_comment_client/middleware.py → ...ssion/django_comment_client/middleware.py
@@ -3,7 +3,7 @@
 
 from six import text_type
 
-from django_comment_client.utils import JsonError
+from lms.djangoapps.discussion.django_comment_client.utils import JsonError
 from django_comment_common.comment_client import CommentClientRequestError
 
 log = logging.getLogger(__name__)

diff --git a/...ngo_comment_client/management/__init__.py → ...ngo_comment_client/migrations/__init__.py b/...ngo_comment_client/management/__init__.py → ...ngo_comment_client/migrations/__init__.py
diff --git a/...jangoapps/django_comment_client/models.py → ...iscussion/django_comment_client/models.py b/...jangoapps/django_comment_client/models.py → ...iscussion/django_comment_client/models.py
diff --git a/...apps/django_comment_client/permissions.py → ...sion/django_comment_client/permissions.py b/...apps/django_comment_client/permissions.py → ...sion/django_comment_client/permissions.py
diff --git a/...ngoapps/django_comment_client/settings.py → ...cussion/django_comment_client/settings.py b/...ngoapps/django_comment_client/settings.py → ...cussion/django_comment_client/settings.py
diff --git a/...nt_client/management/commands/__init__.py → ...n/django_comment_client/tests/__init__.py b/...nt_client/management/commands/__init__.py → ...n/django_comment_client/tests/__init__.py
diff --git a/.../django_comment_client/tests/factories.py → .../django_comment_client/tests/factories.py b/.../django_comment_client/tests/factories.py → .../django_comment_client/tests/factories.py
diff --git a/...s/django_comment_client/tests/group_id.py → ...n/django_comment_client/tests/group_id.py b/...s/django_comment_client/tests/group_id.py → ...n/django_comment_client/tests/group_id.py
diff --git a/...ngo_comment_client/migrations/__init__.py → ...t_client/tests/mock_cs_server/__init__.py b/...ngo_comment_client/migrations/__init__.py → ...t_client/tests/mock_cs_server/__init__.py
diff --git a/...nt/tests/mock_cs_server/mock_cs_server.py → ...nt/tests/mock_cs_server/mock_cs_server.py b/...nt/tests/mock_cs_server/mock_cs_server.py → ...nt/tests/mock_cs_server/mock_cs_server.py
diff --git a/...sts/mock_cs_server/test_mock_cs_server.py → ...sts/mock_cs_server/test_mock_cs_server.py b/...sts/mock_cs_server/test_mock_cs_server.py → ...sts/mock_cs_server/test_mock_cs_server.py
@@ -5,7 +5,7 @@
 
 import pytest
 
-from django_comment_client.tests.mock_cs_server.mock_cs_server import MockCommentServiceServer
+from lms.djangoapps.discussion.django_comment_client.tests.mock_cs_server.mock_cs_server import MockCommentServiceServer
 
 
 class MockCommentServiceServerTest(unittest.TestCase):

diff --git a/...django_comment_client/tests/test.mustache → ...django_comment_client/tests/test.mustache b/...django_comment_client/tests/test.mustache → ...django_comment_client/tests/test.mustache
diff --git a/...o_comment_client/tests/test_middleware.py → ...o_comment_client/tests/test_middleware.py b/...o_comment_client/tests/test_middleware.py → ...o_comment_client/tests/test_middleware.py
@@ -4,7 +4,7 @@
 from django.test import TestCase
 from six import text_type
 
-import django_comment_client.middleware as middleware
+import lms.djangoapps.discussion.django_comment_client.middleware as middleware
 import django_comment_common.comment_client
 
 

diff --git a/...jango_comment_client/tests/test_models.py → ...jango_comment_client/tests/test_models.py b/...jango_comment_client/tests/test_models.py → ...jango_comment_client/tests/test_models.py
diff --git a/...django_comment_client/tests/test_utils.py → ...django_comment_client/tests/test_utils.py b/...django_comment_client/tests/test_utils.py → ...django_comment_client/tests/test_utils.py
@@ -12,15 +12,15 @@
 from pytz import UTC
 from six import text_type
 
-import django_comment_client.utils as utils
+import lms.djangoapps.discussion.django_comment_client.utils as utils
 from course_modes.models import CourseMode
 from course_modes.tests.factories import CourseModeFactory
 from courseware.tabs import get_course_tab_list
 from courseware.tests.factories import InstructorFactory
-from django_comment_client.constants import TYPE_ENTRY, TYPE_SUBCATEGORY
-from django_comment_client.tests.factories import RoleFactory
-from django_comment_client.tests.unicode import UnicodeTestMixin
-from django_comment_client.tests.utils import config_course_discussions, topic_name_to_id
+from lms.djangoapps.discussion.django_comment_client.constants import TYPE_ENTRY, TYPE_SUBCATEGORY
+from lms.djangoapps.discussion.django_comment_client.tests.factories import RoleFactory
+from lms.djangoapps.discussion.django_comment_client.tests.unicode import UnicodeTestMixin
+from lms.djangoapps.discussion.django_comment_client.tests.utils import config_course_discussions, topic_name_to_id
 from django_comment_common.comment_client.utils import CommentClientMaintenanceError, perform_request
 from django_comment_common.models import (
     CourseDiscussionSettings,
@@ -1592,7 +1592,9 @@ def test_get_ability(self):
         user = mock.Mock()
         user.id = 1
 
-        with mock.patch('django_comment_client.utils.check_permissions_by_view') as check_perm:
+        with mock.patch(
+            'lms.djangoapps.discussion.django_comment_client.utils.check_permissions_by_view'
+        ) as check_perm:
             check_perm.return_value = True
             self.assertEqual(utils.get_ability(None, content, user), {
                 'editable': True,
@@ -1620,7 +1622,9 @@ def test_get_ability_with_global_staff(self):
         """
         content = {'user_id': '1', 'type': 'thread'}
 
-        with mock.patch('django_comment_client.utils.check_permissions_by_view') as check_perm:
+        with mock.patch(
+            'lms.djangoapps.discussion.django_comment_client.utils.check_permissions_by_view'
+        ) as check_perm:
             # check_permissions_by_view returns false because user is not enrolled in the course.
             check_perm.return_value = False
             global_staff = UserFactory(username='global_staff', email='[email protected]', is_staff=True)
@@ -1721,7 +1725,10 @@ def setUp(self):
         # Give group moderator permissions to group_moderator
         assign_role(self.course.id, self.group_moderator, 'Group Moderator')
 
-    @mock.patch('django_comment_client.permissions._check_condition', side_effect=_check_condition)
+    @mock.patch(
+        'lms.djangoapps.discussion.django_comment_client.permissions._check_condition',
+        side_effect=_check_condition,
+    )
     def test_not_divided(self, check_condition_function):
         """
         Group moderator should not have moderator permissions if the discussions are not divided.
@@ -1754,7 +1761,10 @@ def test_not_divided(self, check_condition_function):
             'can_report': True
         })
 
-    @mock.patch('django_comment_client.permissions._check_condition', side_effect=_check_condition)
+    @mock.patch(
+        'lms.djangoapps.discussion.django_comment_client.permissions._check_condition',
+        side_effect=_check_condition,
+    )
     def test_divided_within_group(self, check_condition_function):
         """
         Group moderator should have moderator permissions within their group if the discussions are divided.
@@ -1783,7 +1793,10 @@ def test_divided_within_group(self, check_condition_function):
             'can_report': True
         })
 
-    @mock.patch('django_comment_client.permissions._check_condition', side_effect=_check_condition)
+    @mock.patch(
+        'lms.djangoapps.discussion.django_comment_client.permissions._check_condition',
+        side_effect=_check_condition,
+    )
     def test_divided_outside_group(self, check_condition_function):
         """
         Group moderator should not have moderator permissions outside of their group.

diff --git a/...ps/django_comment_client/tests/unicode.py → ...on/django_comment_client/tests/unicode.py b/...ps/django_comment_client/tests/unicode.py → ...on/django_comment_client/tests/unicode.py
diff --git a/...apps/django_comment_client/tests/utils.py → ...sion/django_comment_client/tests/utils.py b/...apps/django_comment_client/tests/utils.py → ...sion/django_comment_client/tests/utils.py
diff --git a/lms/djangoapps/django_comment_client/urls.py → .../discussion/django_comment_client/urls.py b/lms/djangoapps/django_comment_client/urls.py → .../discussion/django_comment_client/urls.py
@@ -4,5 +4,5 @@
 from django.conf.urls import include, url
 
 urlpatterns = [
-    url(r'', include('django_comment_client.base.urls')),
+    url(r'', include('lms.djangoapps.discussion.django_comment_client.base.urls')),
 ]
diff --git a/...djangoapps/django_comment_client/utils.py → ...discussion/django_comment_client/utils.py b/...djangoapps/django_comment_client/utils.py → ...discussion/django_comment_client/utils.py
@@ -15,9 +15,9 @@
 
 from courseware import courses
 from courseware.access import has_access
-from django_comment_client.constants import TYPE_ENTRY, TYPE_SUBCATEGORY
-from django_comment_client.permissions import check_permissions_by_view, get_team, has_permission
-from django_comment_client.settings import MAX_COMMENT_DEPTH
+from lms.djangoapps.discussion.django_comment_client.constants import TYPE_ENTRY, TYPE_SUBCATEGORY
+from lms.djangoapps.discussion.django_comment_client.permissions import check_permissions_by_view, get_team, has_permission
+from lms.djangoapps.discussion.django_comment_client.settings import MAX_COMMENT_DEPTH
 from django_comment_common.models import (
     FORUM_ROLE_STUDENT,
     FORUM_ROLE_COMMUNITY_TA,

diff --git a/...s/django_comment_client/tests/__init__.py → ...ngoapps/discussion/management/__init__.py b/...s/django_comment_client/tests/__init__.py → ...ngoapps/discussion/management/__init__.py
diff --git a/...t_client/tests/mock_cs_server/__init__.py → ...iscussion/management/commands/__init__.py b/...t_client/tests/mock_cs_server/__init__.py → ...iscussion/management/commands/__init__.py
diff --git a/...client/management/commands/assign_role.py → ...ussion/management/commands/assign_role.py b/...client/management/commands/assign_role.py → ...ussion/management/commands/assign_role.py
diff --git a/...ement/commands/assign_roles_for_course.py → ...ement/commands/assign_roles_for_course.py b/...ement/commands/assign_roles_for_course.py → ...ement/commands/assign_roles_for_course.py
diff --git a/...ent/commands/create_roles_for_existing.py → ...ent/commands/create_roles_for_existing.py b/...ent/commands/create_roles_for_existing.py → ...ent/commands/create_roles_for_existing.py
diff --git a/...anagement/commands/get_discussion_link.py → ...anagement/commands/get_discussion_link.py b/...anagement/commands/get_discussion_link.py → ...anagement/commands/get_discussion_link.py
diff --git a/...management/commands/reload_forum_users.py → ...management/commands/reload_forum_users.py b/...management/commands/reload_forum_users.py → ...management/commands/reload_forum_users.py
diff --git a/...gement/commands/seed_permissions_roles.py → ...gement/commands/seed_permissions_roles.py b/...gement/commands/seed_permissions_roles.py → ...gement/commands/seed_permissions_roles.py
diff --git a/...t/management/commands/show_permissions.py → ...n/management/commands/show_permissions.py b/...t/management/commands/show_permissions.py → ...n/management/commands/show_permissions.py
diff --git a/...ent/management/commands/sync_user_info.py → ...ion/management/commands/sync_user_info.py b/...ent/management/commands/sync_user_info.py → ...ion/management/commands/sync_user_info.py
diff --git a/lms/djangoapps/discussion/plugins.py b/lms/djangoapps/discussion/plugins.py
@@ -5,7 +5,7 @@
 from django.conf import settings
 from django.utils.translation import ugettext_noop
 
-import django_comment_client.utils as utils
+import lms.djangoapps.discussion.django_comment_client.utils as utils
 from courseware.tabs import EnrolledTab
 from xmodule.tabs import TabFragmentViewMixin
 

diff --git a/lms/djangoapps/discussion/rest_api/api.py b/lms/djangoapps/discussion/rest_api/api.py
@@ -24,8 +24,8 @@
     get_initializable_thread_fields
 )
 from lms.djangoapps.discussion.rest_api.serializers import CommentSerializer, DiscussionTopicSerializer, ThreadSerializer, get_context
-from django_comment_client.base.views import track_comment_created_event, track_thread_created_event, track_voted_event
-from django_comment_client.utils import get_accessible_discussion_xblocks, get_group_id_for_user, is_commentable_divided
+from lms.djangoapps.discussion.django_comment_client.base.views import track_comment_created_event, track_thread_created_event, track_voted_event
+from lms.djangoapps.discussion.django_comment_client.utils import get_accessible_discussion_xblocks, get_group_id_for_user, is_commentable_divided
 from django_comment_common.comment_client.comment import Comment
 from django_comment_common.comment_client.thread import Thread
 from django_comment_common.comment_client.utils import CommentClientRequestError

diff --git a/lms/djangoapps/discussion/rest_api/serializers.py b/lms/djangoapps/discussion/rest_api/serializers.py
@@ -12,7 +12,7 @@
 from discussion.views import get_divided_discussions
 from lms.djangoapps.discussion.rest_api.permissions import NON_UPDATABLE_COMMENT_FIELDS, NON_UPDATABLE_THREAD_FIELDS, get_editable_fields
 from lms.djangoapps.discussion.rest_api.render import render_body
-from django_comment_client.utils import is_comment_too_deep, get_group_id_for_user, get_group_name
+from lms.djangoapps.discussion.django_comment_client.utils import is_comment_too_deep, get_group_id_for_user, get_group_name
 from django_comment_common.models import (
     FORUM_ROLE_ADMINISTRATOR,
     FORUM_ROLE_COMMUNITY_TA,

diff --git a/lms/djangoapps/discussion/rest_api/tests/test_api.py b/lms/djangoapps/discussion/rest_api/tests/test_api.py
@@ -38,7 +38,7 @@
     make_minimal_cs_thread,
     make_paginated_api_response
 )
-from django_comment_client.tests.utils import ForumsEnableMixin
+from lms.djangoapps.discussion.django_comment_client.tests.utils import ForumsEnableMixin
 from django_comment_common.models import (
     FORUM_ROLE_ADMINISTRATOR,
     FORUM_ROLE_COMMUNITY_TA,

diff --git a/lms/djangoapps/discussion/rest_api/tests/test_serializers.py b/lms/djangoapps/discussion/rest_api/tests/test_serializers.py
@@ -11,7 +11,7 @@
 
 from lms.djangoapps.discussion.rest_api.serializers import CommentSerializer, ThreadSerializer, get_context
 from lms.djangoapps.discussion.rest_api.tests.utils import CommentsServiceMockMixin, make_minimal_cs_comment, make_minimal_cs_thread
-from django_comment_client.tests.utils import ForumsEnableMixin
+from lms.djangoapps.discussion.django_comment_client.tests.utils import ForumsEnableMixin
 from django_comment_common.comment_client.comment import Comment
 from django_comment_common.comment_client.thread import Thread
 from django_comment_common.models import (

diff --git a/lms/djangoapps/discussion/rest_api/tests/test_views.py b/lms/djangoapps/discussion/rest_api/tests/test_views.py
@@ -29,7 +29,7 @@
     make_minimal_cs_thread,
     make_paginated_api_response
 )
-from django_comment_client.tests.utils import ForumsEnableMixin, config_course_discussions, topic_name_to_id
+from lms.djangoapps.discussion.django_comment_client.tests.utils import ForumsEnableMixin, config_course_discussions, topic_name_to_id
 from django_comment_common.models import CourseDiscussionSettings, Role
 from django_comment_common.utils import seed_permissions_roles
 from openedx.core.djangoapps.course_groups.tests.helpers import config_course_cohorts

diff --git a/lms/djangoapps/discussion/rest_api/views.py b/lms/djangoapps/discussion/rest_api/views.py
@@ -17,7 +17,7 @@
 from rest_framework.viewsets import ViewSet
 from six import text_type
 
-from django_comment_client.utils import available_division_schemes
+from lms.djangoapps.discussion.django_comment_client.utils import available_division_schemes
 from django_comment_common import comment_client
 from django_comment_common.models import Role
 from django_comment_common.utils import get_course_discussion_settings, set_course_discussion_settings

diff --git a/lms/djangoapps/discussion/templates/discussion/discussion_board_fragment.html b/lms/djangoapps/discussion/templates/discussion/discussion_board_fragment.html
@@ -10,7 +10,7 @@
 from django.template.defaultfilters import escapejs
 from django.urls import reverse
 
-from django_comment_client.permissions import has_permission
+from lms.djangoapps.discussion.django_comment_client.permissions import has_permission
 from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_string
 from openedx.core.djangolib.markup import HTML
 %>

diff --git a/lms/djangoapps/discussion/templates/discussion/discussion_profile_page.html b/lms/djangoapps/discussion/templates/discussion/discussion_profile_page.html
@@ -10,7 +10,7 @@
 from django.template.defaultfilters import escapejs
 from django.urls import reverse
 
-from django_comment_client.permissions import has_permission
+from lms.djangoapps.discussion.django_comment_client.permissions import has_permission
 from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_string
 %>
 

diff --git a/lms/djangoapps/discussion/tests/test_views.py b/lms/djangoapps/discussion/tests/test_views.py
@@ -14,21 +14,21 @@
 
 from course_modes.models import CourseMode
 from course_modes.tests.factories import CourseModeFactory
-from django_comment_client.constants import TYPE_ENTRY, TYPE_SUBCATEGORY
-from django_comment_client.permissions import get_team
-from django_comment_client.tests.group_id import (
+from lms.djangoapps.discussion.django_comment_client.constants import TYPE_ENTRY, TYPE_SUBCATEGORY
+from lms.djangoapps.discussion.django_comment_client.permissions import get_team
+from lms.djangoapps.discussion.django_comment_client.tests.group_id import (
     CohortedTopicGroupIdTestMixin,
     GroupIdAssertionMixin,
     NonCohortedTopicGroupIdTestMixin
 )
-from django_comment_client.tests.unicode import UnicodeTestMixin
-from django_comment_client.tests.utils import (
+from lms.djangoapps.discussion.django_comment_client.tests.unicode import UnicodeTestMixin
+from lms.djangoapps.discussion.django_comment_client.tests.utils import (
     CohortedTestCase,
     ForumsEnableMixin,
     config_course_discussions,
     topic_name_to_id
 )
-from django_comment_client.utils import strip_none
+from lms.djangoapps.discussion.django_comment_client.utils import strip_none
 from django_comment_common.comment_client.utils import CommentClientPaginatedResult
 from django_comment_common.models import (
     CourseDiscussionSettings,

diff --git a/lms/djangoapps/discussion/views.py b/lms/djangoapps/discussion/views.py
@@ -23,16 +23,16 @@
 from rest_framework import status
 from web_fragments.fragment import Fragment
 
-import django_comment_client.utils as utils
+import lms.djangoapps.discussion.django_comment_client.utils as utils
 import django_comment_common.comment_client as cc
 from lms.djangoapps.experiments.utils import get_experiment_user_metadata_context
 from courseware.access import has_access
 from courseware.courses import get_course_with_access
 from courseware.views.views import CourseTabView
-from django_comment_client.base.views import track_thread_viewed_event
-from django_comment_client.constants import TYPE_ENTRY
-from django_comment_client.permissions import get_team, has_permission
-from django_comment_client.utils import (
+from lms.djangoapps.discussion.django_comment_client.base.views import track_thread_viewed_event
+from lms.djangoapps.discussion.django_comment_client.constants import TYPE_ENTRY
+from lms.djangoapps.discussion.django_comment_client.permissions import get_team, has_permission
+from lms.djangoapps.discussion.django_comment_client.utils import (
     add_courseware_context,
     available_division_schemes,
     course_discussion_division_enabled,

diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py
@@ -48,7 +48,7 @@
 from courseware.access import has_access
 from courseware.courses import get_course_by_id, get_course_with_access
 from courseware.models import StudentModule
-from django_comment_client.utils import (
+from lms.djangoapps.discussion.django_comment_client.utils import (
     get_course_discussion_settings,
     get_group_id_for_user,
     get_group_name,