From ef845ebc43871d97277182bd530191e3f6ee6a68 Mon Sep 17 00:00:00 2001 From: Kyle McCormick Date: Thu, 24 Sep 2020 16:36:46 -0400 Subject: [PATCH] Fully qualify remaining edxnotes imports --- lms/djangoapps/courseware/views/views.py | 2 +- lms/djangoapps/edxnotes/api_urls.py | 2 +- lms/djangoapps/edxnotes/helpers.py | 4 ++-- lms/djangoapps/edxnotes/views.py | 4 ++-- lms/templates/courseware/courseware.html | 2 +- lms/templates/edxnotes/edxnotes.html | 2 +- lms/urls.py | 4 ++-- openedx/core/djangoapps/courseware_api/views.py | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lms/djangoapps/courseware/views/views.py b/lms/djangoapps/courseware/views/views.py index ae867e3d1b..aecdfc3420 100644 --- a/lms/djangoapps/courseware/views/views.py +++ b/lms/djangoapps/courseware/views/views.py @@ -50,7 +50,7 @@ from web_fragments.fragment import Fragment import survey.views from course_modes.models import CourseMode, get_course_prices from edxmako.shortcuts import marketing_link, render_to_response, render_to_string -from edxnotes.helpers import is_feature_enabled +from lms.djangoapps.edxnotes.helpers import is_feature_enabled from lms.djangoapps.ccx.custom_exception import CCXLocatorValidationException from lms.djangoapps.certificates import api as certs_api from lms.djangoapps.certificates.models import CertificateStatuses diff --git a/lms/djangoapps/edxnotes/api_urls.py b/lms/djangoapps/edxnotes/api_urls.py index bcf0984c29..1ac92b69ee 100644 --- a/lms/djangoapps/edxnotes/api_urls.py +++ b/lms/djangoapps/edxnotes/api_urls.py @@ -5,7 +5,7 @@ API URLs for EdxNotes from django.conf.urls import url -from edxnotes import views +from lms.djangoapps.edxnotes import views urlpatterns = [ url(r"^retire_user/$", views.RetireUserView.as_view(), name="edxnotes_retire_user"), diff --git a/lms/djangoapps/edxnotes/helpers.py b/lms/djangoapps/edxnotes/helpers.py index 437018a6f4..beee9f368f 100644 --- a/lms/djangoapps/edxnotes/helpers.py +++ b/lms/djangoapps/edxnotes/helpers.py @@ -23,8 +23,8 @@ from requests.exceptions import RequestException from lms.djangoapps.courseware.access import has_access from lms.djangoapps.courseware.courses import get_current_child -from edxnotes.exceptions import EdxNotesParseError, EdxNotesServiceUnavailable -from edxnotes.plugins import EdxNotesTab +from lms.djangoapps.edxnotes.exceptions import EdxNotesParseError, EdxNotesServiceUnavailable +from lms.djangoapps.edxnotes.plugins import EdxNotesTab from lms.lib.utils import get_parent_unit from openedx.core.djangoapps.oauth_dispatch.jwt import create_jwt_for_user from openedx.core.djangolib.markup import Text diff --git a/lms/djangoapps/edxnotes/views.py b/lms/djangoapps/edxnotes/views.py index 7551673392..5123c84235 100644 --- a/lms/djangoapps/edxnotes/views.py +++ b/lms/djangoapps/edxnotes/views.py @@ -22,8 +22,8 @@ from lms.djangoapps.courseware.courses import get_course_with_access from lms.djangoapps.courseware.model_data import FieldDataCache from lms.djangoapps.courseware.module_render import get_module_for_descriptor from edxmako.shortcuts import render_to_response -from edxnotes.exceptions import EdxNotesParseError, EdxNotesServiceUnavailable -from edxnotes.helpers import ( +from lms.djangoapps.edxnotes.exceptions import EdxNotesParseError, EdxNotesServiceUnavailable +from lms.djangoapps.edxnotes.helpers import ( DEFAULT_PAGE, DEFAULT_PAGE_SIZE, NoteJSONEncoder, diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html index 60f4b9e766..2bf97f0273 100644 --- a/lms/templates/courseware/courseware.html +++ b/lms/templates/courseware/courseware.html @@ -10,7 +10,7 @@ from django.conf import settings from django.urls import reverse from django.utils.translation import ugettext as _ -from edxnotes.helpers import is_feature_enabled as is_edxnotes_enabled +from lms.djangoapps.edxnotes.helpers import is_feature_enabled as is_edxnotes_enabled from openedx.core.djangolib.js_utils import js_escaped_string from openedx.core.djangolib.markup import HTML from openedx.features.course_experience import course_home_page_title, COURSE_OUTLINE_PAGE_FLAG diff --git a/lms/templates/edxnotes/edxnotes.html b/lms/templates/edxnotes/edxnotes.html index abae77e9af..445b52f856 100644 --- a/lms/templates/edxnotes/edxnotes.html +++ b/lms/templates/edxnotes/edxnotes.html @@ -4,7 +4,7 @@ <%def name="online_help_token()"><% return "notes" %> <%! from django.utils.translation import ugettext as _ -from edxnotes.helpers import NoteJSONEncoder +from lms.djangoapps.edxnotes.helpers import NoteJSONEncoder from openedx.core.djangolib.markup import HTML, Text from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_string %> diff --git a/lms/urls.py b/lms/urls.py index 462e7070cf..e6620b7d9c 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -601,14 +601,14 @@ urlpatterns += [ r'^courses/{}/edxnotes/'.format( settings.COURSE_ID_PATTERN, ), - include('edxnotes.urls'), + include('lms.djangoapps.edxnotes.urls'), name='edxnotes_endpoints', ), # Student Notes API url( r'^api/edxnotes/v1/', - include('edxnotes.api_urls'), + include('lms.djangoapps.edxnotes.api_urls'), ), # Branding API diff --git a/openedx/core/djangoapps/courseware_api/views.py b/openedx/core/djangoapps/courseware_api/views.py index fd453f18c6..400bf37e9c 100644 --- a/openedx/core/djangoapps/courseware_api/views.py +++ b/openedx/core/djangoapps/courseware_api/views.py @@ -20,7 +20,7 @@ from rest_framework.response import Response from rest_framework.views import APIView from course_modes.models import CourseMode -from edxnotes.helpers import is_feature_enabled +from lms.djangoapps.edxnotes.helpers import is_feature_enabled from lms.djangoapps.course_api.api import course_detail from lms.djangoapps.courseware.access import has_access from lms.djangoapps.courseware.access_response import (