From 0cd8f58bcc0e71cec792a97798936cd1a73de437 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 2 Aug 2019 15:37:07 -0400 Subject: [PATCH] Remove all instances of `from instructor import` imports --- lms/djangoapps/bulk_enroll/views.py | 2 +- .../ccx/migrations/0005_change_ccx_coach_to_staff.py | 2 +- lms/djangoapps/class_dashboard/dashboard_data.py | 2 +- lms/djangoapps/discussion/rest_api/views.py | 2 +- lms/djangoapps/instructor_analytics/tests/test_basic.py | 2 +- lms/djangoapps/instructor_analytics/tests/test_csvs.py | 2 +- .../instructor_analytics/tests/test_distributions.py | 2 +- lms/djangoapps/instructor_task/tasks_helper/enrollments.py | 4 ++-- lms/djangoapps/instructor_task/tasks_helper/grades.py | 4 ++-- lms/djangoapps/instructor_task/tasks_helper/misc.py | 4 ++-- lms/djangoapps/instructor_task/tests/test_tasks_helper.py | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lms/djangoapps/bulk_enroll/views.py b/lms/djangoapps/bulk_enroll/views.py index f5a1bef36b..a62d7302f9 100644 --- a/lms/djangoapps/bulk_enroll/views.py +++ b/lms/djangoapps/bulk_enroll/views.py @@ -14,7 +14,7 @@ from rest_framework.response import Response from rest_framework.views import APIView from bulk_enroll.serializers import BulkEnrollmentSerializer -from instructor.views.api import students_update_enrollment +from lms.djangoapps.instructor.views.api import students_update_enrollment from openedx.core.djangoapps.course_groups.cohorts import add_user_to_cohort, get_cohort_by_name from openedx.core.djangoapps.course_groups.models import CourseUserGroup from openedx.core.djangoapps.enrollments.views import EnrollmentUserThrottle diff --git a/lms/djangoapps/ccx/migrations/0005_change_ccx_coach_to_staff.py b/lms/djangoapps/ccx/migrations/0005_change_ccx_coach_to_staff.py index 66191f9145..a42d0f0119 100644 --- a/lms/djangoapps/ccx/migrations/0005_change_ccx_coach_to_staff.py +++ b/lms/djangoapps/ccx/migrations/0005_change_ccx_coach_to_staff.py @@ -10,7 +10,7 @@ from django.db import migrations from django.http import Http404 from courseware.courses import get_course_by_id -from instructor.access import allow_access, revoke_access +from lms.djangoapps.instructor.access import allow_access, revoke_access log = logging.getLogger("edx.ccx") diff --git a/lms/djangoapps/class_dashboard/dashboard_data.py b/lms/djangoapps/class_dashboard/dashboard_data.py index f39642aed7..c4a04d54c4 100644 --- a/lms/djangoapps/class_dashboard/dashboard_data.py +++ b/lms/djangoapps/class_dashboard/dashboard_data.py @@ -11,7 +11,7 @@ from opaque_keys.edx.locator import BlockUsageLocator from six import text_type from courseware import models -from instructor_analytics.csvs import create_csv_response +from lms.djangoapps.instructor_analytics.csvs import create_csv_response from util.json_request import JsonResponse from xmodule.modulestore.django import modulestore from xmodule.modulestore.inheritance import own_metadata diff --git a/lms/djangoapps/discussion/rest_api/views.py b/lms/djangoapps/discussion/rest_api/views.py index af2179e9a3..e534872c0b 100644 --- a/lms/djangoapps/discussion/rest_api/views.py +++ b/lms/djangoapps/discussion/rest_api/views.py @@ -19,7 +19,7 @@ from rest_framework.viewsets import ViewSet from six import text_type from discussion.views import get_divided_discussions -from instructor.access import update_forum_role +from lms.djangoapps.instructor.access import update_forum_role from lms.djangoapps.discussion.django_comment_client.utils import available_division_schemes from lms.djangoapps.discussion.rest_api.api import ( create_comment, diff --git a/lms/djangoapps/instructor_analytics/tests/test_basic.py b/lms/djangoapps/instructor_analytics/tests/test_basic.py index c2118deae7..e9e3bc3268 100644 --- a/lms/djangoapps/instructor_analytics/tests/test_basic.py +++ b/lms/djangoapps/instructor_analytics/tests/test_basic.py @@ -20,7 +20,7 @@ from six.moves import range, zip from course_modes.models import CourseMode from course_modes.tests.factories import CourseModeFactory from courseware.tests.factories import InstructorFactory -from instructor_analytics.basic import ( +from lms.djangoapps.instructor_analytics.basic import ( AVAILABLE_FEATURES, PROFILE_FEATURES, STUDENT_FEATURES, diff --git a/lms/djangoapps/instructor_analytics/tests/test_csvs.py b/lms/djangoapps/instructor_analytics/tests/test_csvs.py index c943619fec..e496f6964c 100644 --- a/lms/djangoapps/instructor_analytics/tests/test_csvs.py +++ b/lms/djangoapps/instructor_analytics/tests/test_csvs.py @@ -6,7 +6,7 @@ import pytest from django.test import TestCase from six.moves import range -from instructor_analytics.csvs import create_csv_response, format_dictlist, format_instances +from lms.djangoapps.instructor_analytics.csvs import create_csv_response, format_dictlist, format_instances class TestAnalyticsCSVS(TestCase): diff --git a/lms/djangoapps/instructor_analytics/tests/test_distributions.py b/lms/djangoapps/instructor_analytics/tests/test_distributions.py index ad3a829642..1ca18523cc 100644 --- a/lms/djangoapps/instructor_analytics/tests/test_distributions.py +++ b/lms/djangoapps/instructor_analytics/tests/test_distributions.py @@ -6,7 +6,7 @@ from django.test import TestCase from opaque_keys.edx.locator import CourseLocator from six.moves import range -from instructor_analytics.distributions import AVAILABLE_PROFILE_FEATURES, profile_distribution +from lms.djangoapps.instructor_analytics.distributions import AVAILABLE_PROFILE_FEATURES, profile_distribution from student.models import CourseEnrollment from student.tests.factories import UserFactory diff --git a/lms/djangoapps/instructor_task/tasks_helper/enrollments.py b/lms/djangoapps/instructor_task/tasks_helper/enrollments.py index 4843cbc3ff..ba745c4caa 100644 --- a/lms/djangoapps/instructor_task/tasks_helper/enrollments.py +++ b/lms/djangoapps/instructor_task/tasks_helper/enrollments.py @@ -14,8 +14,8 @@ from pytz import UTC from courseware.courses import get_course_by_id from edxmako.shortcuts import render_to_string -from instructor_analytics.basic import enrolled_students_features, list_may_enroll -from instructor_analytics.csvs import format_dictlist +from lms.djangoapps.instructor_analytics.basic import enrolled_students_features, list_may_enroll +from lms.djangoapps.instructor_analytics.csvs import format_dictlist from lms.djangoapps.instructor.paidcourse_enrollment_report import PaidCourseEnrollmentReportProvider from lms.djangoapps.instructor_task.models import ReportStore from shoppingcart.models import ( diff --git a/lms/djangoapps/instructor_task/tasks_helper/grades.py b/lms/djangoapps/instructor_task/tasks_helper/grades.py index c97887b065..5ca6f833f2 100644 --- a/lms/djangoapps/instructor_task/tasks_helper/grades.py +++ b/lms/djangoapps/instructor_task/tasks_helper/grades.py @@ -22,8 +22,8 @@ from six.moves import zip, zip_longest from course_blocks.api import get_course_blocks from courseware.courses import get_course_by_id from courseware.user_state_client import DjangoXBlockUserStateClient -from instructor_analytics.basic import list_problem_responses -from instructor_analytics.csvs import format_dictlist +from lms.djangoapps.instructor_analytics.basic import list_problem_responses +from lms.djangoapps.instructor_analytics.csvs import format_dictlist from lms.djangoapps.certificates.models import CertificateWhitelist, GeneratedCertificate, certificate_info_for_user from lms.djangoapps.grades.api import CourseGradeFactory from lms.djangoapps.grades.api import context as grades_context diff --git a/lms/djangoapps/instructor_task/tasks_helper/misc.py b/lms/djangoapps/instructor_task/tasks_helper/misc.py index f505db4944..f836b34c92 100644 --- a/lms/djangoapps/instructor_task/tasks_helper/misc.py +++ b/lms/djangoapps/instructor_task/tasks_helper/misc.py @@ -18,8 +18,8 @@ from django.core.files.storage import DefaultStorage from openassessment.data import OraAggregateData from pytz import UTC -from instructor_analytics.basic import get_proctored_exam_results -from instructor_analytics.csvs import format_dictlist +from lms.djangoapps.instructor_analytics.basic import get_proctored_exam_results +from lms.djangoapps.instructor_analytics.csvs import format_dictlist from openedx.core.djangoapps.course_groups.cohorts import add_user_to_cohort from openedx.core.djangoapps.course_groups.models import CourseUserGroup from survey.models import SurveyAnswer diff --git a/lms/djangoapps/instructor_task/tests/test_tasks_helper.py b/lms/djangoapps/instructor_task/tests/test_tasks_helper.py index bf4c760f51..1bf308fda9 100644 --- a/lms/djangoapps/instructor_task/tests/test_tasks_helper.py +++ b/lms/djangoapps/instructor_task/tests/test_tasks_helper.py @@ -33,7 +33,7 @@ from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory from course_modes.models import CourseMode from course_modes.tests.factories import CourseModeFactory from courseware.tests.factories import InstructorFactory -from instructor_analytics.basic import UNAVAILABLE, list_problem_responses +from lms.djangoapps.instructor_analytics.basic import UNAVAILABLE, list_problem_responses from lms.djangoapps.certificates.models import CertificateStatuses, GeneratedCertificate from lms.djangoapps.certificates.tests.factories import CertificateWhitelistFactory, GeneratedCertificateFactory from lms.djangoapps.grades.models import PersistentCourseGrade