Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use full names for common.djangoapps imports; warn when using old style (#25477)

Browse Source 
* Generate common/djangoapps import shims for LMS
* Generate common/djangoapps import shims for Studio
* Stop appending project root to sys.path
* Stop appending common/djangoapps to sys.path
* Import from common.djangoapps.course_action_state instead of course_action_state
* Import from common.djangoapps.course_modes instead of course_modes
* Import from common.djangoapps.database_fixups instead of database_fixups
* Import from common.djangoapps.edxmako instead of edxmako
* Import from common.djangoapps.entitlements instead of entitlements
* Import from common.djangoapps.pipline_mako instead of pipeline_mako
* Import from common.djangoapps.static_replace instead of static_replace
* Import from common.djangoapps.student instead of student
* Import from common.djangoapps.terrain instead of terrain
* Import from common.djangoapps.third_party_auth instead of third_party_auth
* Import from common.djangoapps.track instead of track
* Import from common.djangoapps.util instead of util
* Import from common.djangoapps.xblock_django instead of xblock_django
* Add empty common/djangoapps/__init__.py to fix pytest collection
* Fix pylint formatting violations
* Exclude import_shims/ directory tree from linting
This commit is contained in:
Kyle McCormick
2020-11-10 07:02:01 -05:00
committed by GitHub
parent a62c5dad49
commit 151bd13666
1707 changed files with 6132 additions and 2430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lms/devstack.yml
View File

@@ -24,10 +24,10 @@ AUDIT_CERT_CUTOFF_DATE: null
AUTH_DOCUMENTATION_URL: http://course-catalog-api-guide.readthedocs.io/en/latest/authentication/index.html
AUTH_PASSWORD_VALIDATORS:
- NAME: django.contrib.auth.password_validation.UserAttributeSimilarityValidator
- NAME: util.password_policy_validators.MinimumLengthValidator
- NAME: common.djangoapps.util.password_policy_validators.MinimumLengthValidator
OPTIONS:
min_length: 2
- NAME: util.password_policy_validators.MaximumLengthValidator
- NAME: common.djangoapps.util.password_policy_validators.MaximumLengthValidator
OPTIONS:
max_length: 75
AWS_ACCESS_KEY_ID: null
@@ -54,47 +54,47 @@ BULK_EMAIL_ROUTING_KEY_SMALL_JOBS: edx.lms.core.default
CACHES:
celery:
BACKEND: django.core.cache.backends.memcached.MemcachedCache
KEY_FUNCTION: util.memcache.safe_key
KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
KEY_PREFIX: celery
LOCATION:
- edx.devstack.memcached:11211
TIMEOUT: '7200'
configuration:
BACKEND: django.core.cache.backends.memcached.MemcachedCache
KEY_FUNCTION: util.memcache.safe_key
KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
KEY_PREFIX: 1001c6274ca4
LOCATION:
- edx.devstack.memcached:11211
course_structure_cache:
BACKEND: django.core.cache.backends.memcached.MemcachedCache
KEY_FUNCTION: util.memcache.safe_key
KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
KEY_PREFIX: course_structure
LOCATION:
- edx.devstack.memcached:11211
TIMEOUT: '7200'
default:
BACKEND: django.core.cache.backends.memcached.MemcachedCache
KEY_FUNCTION: util.memcache.safe_key
KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
KEY_PREFIX: default
LOCATION:
- edx.devstack.memcached:11211
VERSION: '1'
general:
BACKEND: django.core.cache.backends.memcached.MemcachedCache
KEY_FUNCTION: util.memcache.safe_key
KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
KEY_PREFIX: general
LOCATION:
- edx.devstack.memcached:11211
mongo_metadata_inheritance:
BACKEND: django.core.cache.backends.memcached.MemcachedCache
KEY_FUNCTION: util.memcache.safe_key
KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
KEY_PREFIX: mongo_metadata_inheritance
LOCATION:
- edx.devstack.memcached:11211
TIMEOUT: 300
staticfiles:
BACKEND: django.core.cache.backends.memcached.MemcachedCache
KEY_FUNCTION: util.memcache.safe_key
KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
KEY_PREFIX: 1001c6274ca4_general
LOCATION:
- edx.devstack.memcached:11211

4
lms/djangoapps/badges/api/tests.py
View File

@@ -11,8 +11,8 @@ from six.moves import range
from lms.djangoapps.badges.tests.factories import BadgeAssertionFactory, BadgeClassFactory, RandomBadgeClassFactory
from openedx.core.lib.api.test_utils import ApiTestCase
from student.tests.factories import UserFactory
from util.testing import UrlResetMixin
from common.djangoapps.student.tests.factories import UserFactory
from common.djangoapps.util.testing import UrlResetMixin
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

4
lms/djangoapps/badges/backends/tests/test_badgr_backend.py
View File

@@ -16,8 +16,8 @@ from lms.djangoapps.badges.backends.badgr import BadgrBackend
from lms.djangoapps.badges.models import BadgeAssertion
from lms.djangoapps.badges.tests.factories import BadgeClassFactory
from openedx.core.lib.tests.assertions.events import assert_event_matches
from student.tests.factories import CourseEnrollmentFactory, UserFactory
from track.tests import EventTrackingTestCase
from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
from common.djangoapps.track.tests import EventTrackingTestCase
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

2
lms/djangoapps/badges/events/course_complete.py
View File

@@ -85,7 +85,7 @@ def get_completion_badge(course_id, user):
Given a course key and a user, find the user's enrollment mode
and get the Course Completion badge.
"""
from student.models import CourseEnrollment
from common.djangoapps.student.models import CourseEnrollment
badge_classes = CourseEnrollment.objects.filter(
user=user, course_id=course_id
).order_by('-is_active')

2
lms/djangoapps/badges/events/tests/test_course_complete.py
View File

@@ -6,7 +6,7 @@ from uuid import uuid4
from lms.djangoapps.badges.events import course_complete
from lms.djangoapps.certificates.models import GeneratedCertificate
from student.tests.factories import UserFactory
from common.djangoapps.student.tests.factories import UserFactory
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

4
lms/djangoapps/badges/events/tests/test_course_meta.py
View File

@@ -12,8 +12,8 @@ from mock import patch
from lms.djangoapps.badges.tests.factories import CourseEventBadgesConfigurationFactory, RandomBadgeClassFactory
from lms.djangoapps.certificates.models import CertificateStatuses, GeneratedCertificate
from student.models import CourseEnrollment
from student.tests.factories import UserFactory
from common.djangoapps.student.models import CourseEnrollment
from common.djangoapps.student.tests.factories import UserFactory
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

4
lms/djangoapps/badges/handlers.py
View File

@@ -7,8 +7,8 @@ from django.dispatch import receiver
from lms.djangoapps.badges.events.course_meta import award_enrollment_badge
from lms.djangoapps.badges.utils import badges_enabled
from student.models import EnrollStatusChange
from student.signals import ENROLL_STATUS_CHANGE
from common.djangoapps.student.models import EnrollStatusChange
from common.djangoapps.student.signals import ENROLL_STATUS_CHANGE
@receiver(ENROLL_STATUS_CHANGE)

2
lms/djangoapps/badges/tests/factories.py
View File

@@ -11,7 +11,7 @@ from factory import DjangoModelFactory
from factory.django import ImageField
from lms.djangoapps.badges.models import BadgeAssertion, BadgeClass, CourseCompleteImageConfiguration, CourseEventBadgesConfiguration
from student.tests.factories import UserFactory
from common.djangoapps.student.tests.factories import UserFactory
def generate_dummy_image(_unused):

2
lms/djangoapps/badges/tests/test_models.py
View File

@@ -22,7 +22,7 @@ from lms.djangoapps.badges.models import (
)
from lms.djangoapps.badges.tests.factories import BadgeAssertionFactory, BadgeClassFactory, RandomBadgeClassFactory
from lms.djangoapps.certificates.tests.test_models import TEST_DATA_ROOT
from student.tests.factories import UserFactory
from common.djangoapps.student.tests.factories import UserFactory
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

2
lms/djangoapps/branding/api.py
View File

@@ -24,7 +24,7 @@ from django.utils.translation import ugettext as _
from six.moves.urllib.parse import urljoin
from lms.djangoapps.branding.models import BrandingApiConfig
from edxmako.shortcuts import marketing_link
from common.djangoapps.edxmako.shortcuts import marketing_link
from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
log = logging.getLogger("edx.footer")

14
lms/djangoapps/branding/tests/test_page.py
View File

@@ -18,9 +18,9 @@ from pytz import UTC
from lms.djangoapps.branding.views import index
from lms.djangoapps.courseware.tests.helpers import LoginEnrollmentTestCase
from edxmako.shortcuts import render_to_response
from common.djangoapps.edxmako.shortcuts import render_to_response
from openedx.core.djangoapps.site_configuration.tests.mixins import SiteMixin
from util.milestones_helpers import set_prerequisite_courses
from common.djangoapps.util.milestones_helpers import set_prerequisite_courses
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory
@@ -190,7 +190,7 @@ class IndexPageCourseCardsSortingTests(ModuleStoreTestCase):
)
self.factory = RequestFactory()
@patch('student.views.management.render_to_response', RENDER_MOCK)
@patch('common.djangoapps.student.views.management.render_to_response', RENDER_MOCK)
@patch('lms.djangoapps.courseware.views.views.render_to_response', RENDER_MOCK)
@patch.dict('django.conf.settings.FEATURES', {'ENABLE_COURSE_DISCOVERY': False})
def test_course_discovery_off(self):
@@ -214,7 +214,7 @@ class IndexPageCourseCardsSortingTests(ModuleStoreTestCase):
# make sure we have the special css class on the section
self.assertContains(response, '<div class="courses no-course-discovery"')
@patch('student.views.management.render_to_response', RENDER_MOCK)
@patch('common.djangoapps.student.views.management.render_to_response', RENDER_MOCK)
@patch('lms.djangoapps.courseware.views.views.render_to_response', RENDER_MOCK)
@patch.dict('django.conf.settings.FEATURES', {'ENABLE_COURSE_DISCOVERY': True})
def test_course_discovery_on(self):
@@ -236,7 +236,7 @@ class IndexPageCourseCardsSortingTests(ModuleStoreTestCase):
self.assertContains(response, '<aside aria-label="Refine Your Search" class="search-facets phone-menu">')
self.assertContains(response, '<div class="courses"')
@patch('student.views.management.render_to_response', RENDER_MOCK)
@patch('common.djangoapps.student.views.management.render_to_response', RENDER_MOCK)
@patch('lms.djangoapps.courseware.views.views.render_to_response', RENDER_MOCK)
@patch.dict('django.conf.settings.FEATURES', {'ENABLE_COURSE_DISCOVERY': False})
def test_course_cards_sorted_by_default_sorting(self):
@@ -261,7 +261,7 @@ class IndexPageCourseCardsSortingTests(ModuleStoreTestCase):
self.assertEqual(context['courses'][1].id, self.starting_later.id)
self.assertEqual(context['courses'][2].id, self.course_with_default_start_date.id)
@patch('student.views.management.render_to_response', RENDER_MOCK)
@patch('common.djangoapps.student.views.management.render_to_response', RENDER_MOCK)
@patch('lms.djangoapps.courseware.views.views.render_to_response', RENDER_MOCK)
@patch.dict('django.conf.settings.FEATURES', {'ENABLE_COURSE_SORTING_BY_START_DATE': False})
@patch.dict('django.conf.settings.FEATURES', {'ENABLE_COURSE_DISCOVERY': False})
@@ -294,7 +294,7 @@ class IndexPageProgramsTests(SiteMixin, ModuleStoreTestCase):
"""
def test_get_programs_with_type_called(self):
views = [
(reverse('root'), 'student.views.management.get_programs_with_type'),
(reverse('root'), 'common.djangoapps.student.views.management.get_programs_with_type'),
(reverse('courses'), 'lms.djangoapps.courseware.views.views.get_programs_with_type'),
]
for url, dotted_path in views:

4
lms/djangoapps/branding/tests/test_views.py
View File

@@ -18,7 +18,7 @@ from openedx.core.djangoapps.lang_pref.api import released_languages
from openedx.core.djangoapps.site_configuration.tests.mixins import SiteMixin
from openedx.core.djangoapps.theming.tests.test_util import with_comprehensive_theme_context
from openedx.core.djangolib.testing.utils import CacheIsolationTestCase
from student.tests.factories import UserFactory
from common.djangoapps.student.tests.factories import UserFactory
@ddt.ddt
@@ -280,7 +280,7 @@ class TestIndex(SiteMixin, TestCase):
""" Set up a user """
super(TestIndex, self).setUp()
patcher = mock.patch("student.models.tracker")
patcher = mock.patch("common.djangoapps.student.models.tracker")
self.mock_tracker = patcher.start()
self.user = UserFactory.create()
self.user.set_password("password")

10
lms/djangoapps/branding/views.py
View File

@@ -18,12 +18,12 @@ from django.views.decorators.csrf import ensure_csrf_cookie
import lms.djangoapps.branding.api as branding_api
import lms.djangoapps.courseware.views.views as courseware_views
import student.views
from edxmako.shortcuts import marketing_link, render_to_response
from common.djangoapps.student import views as student_views
from common.djangoapps.edxmako.shortcuts import marketing_link, render_to_response
from openedx.core.djangoapps.lang_pref.api import released_languages
from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
from util.cache import cache_if_anonymous
from util.json_request import JsonResponse
from common.djangoapps.util.cache import cache_if_anonymous
from common.djangoapps.util.json_request import JsonResponse
log = logging.getLogger(__name__)
@@ -68,7 +68,7 @@ def index(request):
# marketing and edge are enabled
try:
return student.views.index(request, user=request.user)
return student_views.index(request, user=request.user)
except NoReverseMatch:
log.error(
'https is not a registered namespace Request from {}'.format(domain),

8
lms/djangoapps/bulk_email/models.py
View File

@@ -15,16 +15,16 @@ from opaque_keys.edx.django.models import CourseKeyField
from six import text_type
from six.moves import zip
from course_modes.models import CourseMode
from common.djangoapps.course_modes.models import CourseMode
from openedx.core.djangoapps.course_groups.cohorts import get_cohort_by_name
from openedx.core.djangoapps.course_groups.models import CourseUserGroup
from openedx.core.djangoapps.enrollments.api import validate_course_mode
from openedx.core.djangoapps.enrollments.errors import CourseModeNotFoundError
from openedx.core.lib.html_to_text import html_to_text
from openedx.core.lib.mail_utils import wrap_message
from student.roles import CourseInstructorRole, CourseStaffRole
from util.keyword_substitution import substitute_keywords_with_data
from util.query import use_read_replica_if_available
from common.djangoapps.student.roles import CourseInstructorRole, CourseStaffRole
from common.djangoapps.util.keyword_substitution import substitute_keywords_with_data
from common.djangoapps.util.query import use_read_replica_if_available
log = logging.getLogger(__name__)

2
lms/djangoapps/bulk_email/signals.py
View File

@@ -6,7 +6,7 @@ Signal handlers for the bulk_email app
from django.dispatch import receiver
from openedx.core.djangoapps.user_api.accounts.signals import USER_RETIRE_MAILINGS
from student.models import CourseEnrollment
from common.djangoapps.student.models import CourseEnrollment
from .models import Optout

4
lms/djangoapps/bulk_email/tasks.py
View File

@@ -52,8 +52,8 @@ from lms.djangoapps.instructor_task.subtasks import (
)
from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
from openedx.core.lib.courses import course_image_url
from util.date_utils import get_default_time_display
from util.string_utils import _has_non_ascii_characters
from common.djangoapps.util.date_utils import get_default_time_display
from common.djangoapps.util.string_utils import _has_non_ascii_characters
log = logging.getLogger('edx.celery.task')

4
lms/djangoapps/bulk_email/tests/test_course_optout.py
View File

@@ -18,8 +18,8 @@ from six import text_type
from lms.djangoapps.bulk_email.models import BulkEmailFlag
from lms.djangoapps.bulk_email.policies import CourseEmailOptout
from student.models import CourseEnrollment
from student.tests.factories import AdminFactory, CourseEnrollmentFactory, UserFactory
from common.djangoapps.student.models import CourseEnrollment
from common.djangoapps.student.tests.factories import AdminFactory, CourseEnrollmentFactory, UserFactory
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

8
lms/djangoapps/bulk_email/tests/test_email.py
View File

@@ -23,16 +23,16 @@ from mock import Mock, patch
from ..models import BulkEmailFlag, Optout
from lms.djangoapps.bulk_email.tasks import _get_course_email_context, _get_source_address
from course_modes.models import CourseMode
from common.djangoapps.course_modes.models import CourseMode
from lms.djangoapps.courseware.tests.factories import InstructorFactory, StaffFactory
from lms.djangoapps.instructor_task.subtasks import update_subtask_status
from openedx.core.djangoapps.course_groups.cohorts import add_user_to_cohort
from openedx.core.djangoapps.course_groups.models import CourseCohort
from openedx.core.djangoapps.enrollments.api import update_enrollment
from student.models import CourseEnrollment
from student.roles import CourseStaffRole
from student.tests.factories import CourseEnrollmentFactory, UserFactory
from common.djangoapps.student.models import CourseEnrollment
from common.djangoapps.student.roles import CourseStaffRole
from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
from xmodule.modulestore import ModuleStoreEnum
from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

2
lms/djangoapps/bulk_email/tests/test_err_handling.py
View File

@@ -30,7 +30,7 @@ from lms.djangoapps.instructor_task.subtasks import (
initialize_subtask_info,
update_subtask_status
)
from student.tests.factories import AdminFactory, CourseEnrollmentFactory, UserFactory
from common.djangoapps.student.tests.factories import AdminFactory, CourseEnrollmentFactory, UserFactory
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

4
lms/djangoapps/bulk_email/tests/test_models.py
View File

@@ -23,9 +23,9 @@ from lms.djangoapps.bulk_email.models import (
CourseEmailTemplate,
Optout,
)
from course_modes.models import CourseMode
from common.djangoapps.course_modes.models import CourseMode
from openedx.core.djangoapps.course_groups.models import CourseCohort
from student.tests.factories import UserFactory
from common.djangoapps.student.tests.factories import UserFactory
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

2
lms/djangoapps/bulk_email/tests/test_signals.py
View File

@@ -13,7 +13,7 @@ from six import text_type
from lms.djangoapps.bulk_email.models import BulkEmailFlag, Optout
from lms.djangoapps.bulk_email.signals import force_optout_all
from student.tests.factories import AdminFactory, CourseEnrollmentFactory, UserFactory
from common.djangoapps.student.tests.factories import AdminFactory, CourseEnrollmentFactory, UserFactory
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

2
lms/djangoapps/bulk_email/tests/test_views.py
View File

@@ -15,7 +15,7 @@ from six import text_type
from lms.djangoapps.discussion.notification_prefs.views import UsernameCipher
from openedx.core.lib.tests import attr
from student.tests.factories import UserFactory
from common.djangoapps.student.tests.factories import UserFactory
from xmodule.modulestore.tests.factories import CourseFactory
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase

2
lms/djangoapps/bulk_email/views.py
View File

@@ -12,7 +12,7 @@ from django.http import Http404
from lms.djangoapps.bulk_email.models import Optout
from lms.djangoapps.courseware.courses import get_course_by_id
from edxmako.shortcuts import render_to_response
from common.djangoapps.edxmako.shortcuts import render_to_response
from lms.djangoapps.discussion.notification_prefs.views import (
UsernameCipher,
UsernameDecryptionException,

4
lms/djangoapps/bulk_enroll/tests/test_views.py
View File

@@ -21,8 +21,8 @@ from lms.djangoapps.courseware.tests.helpers import LoginEnrollmentTestCase
from openedx.core.djangoapps.course_groups.cohorts import get_cohort_id
from openedx.core.djangoapps.course_groups.tests.helpers import config_course_cohorts
from openedx.core.djangoapps.site_configuration.helpers import get_value as get_site_value
from student.models import ENROLLED_TO_UNENROLLED, UNENROLLED_TO_ENROLLED, CourseEnrollment, ManualEnrollmentAudit
from student.tests.factories import UserFactory
from common.djangoapps.student.models import ENROLLED_TO_UNENROLLED, UNENROLLED_TO_ENROLLED, CourseEnrollment, ManualEnrollmentAudit
from common.djangoapps.student.tests.factories import UserFactory
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

2
lms/djangoapps/bulk_enroll/views.py
View File

@@ -20,7 +20,7 @@ from openedx.core.djangoapps.course_groups.models import CourseUserGroup
from openedx.core.djangoapps.enrollments.views import EnrollmentUserThrottle
from openedx.core.lib.api.authentication import BearerAuthentication
from openedx.core.lib.api.permissions import IsStaff
from util.disable_rate_limit import can_disable_rate_limit
from common.djangoapps.util.disable_rate_limit import can_disable_rate_limit
@can_disable_rate_limit

6
lms/djangoapps/ccx/api/v0/tests/test_views.py
View File

@@ -30,9 +30,9 @@ from lms.djangoapps.ccx.utils import ccx_course as ccx_course_cm
from lms.djangoapps.courseware import courses
from lms.djangoapps.instructor.access import allow_access, list_with_level
from lms.djangoapps.instructor.enrollment import enroll_email, get_email_params
from student.models import CourseEnrollment
from student.roles import CourseCcxCoachRole, CourseInstructorRole, CourseStaffRole
from student.tests.factories import AdminFactory, UserFactory
from common.djangoapps.student.models import CourseEnrollment
from common.djangoapps.student.roles import CourseCcxCoachRole, CourseInstructorRole, CourseStaffRole
from common.djangoapps.student.tests.factories import AdminFactory, UserFactory
USER_PASSWORD = 'test'

4
lms/djangoapps/ccx/api/v0/views.py
View File

@@ -27,8 +27,8 @@ from lms.djangoapps.ccx.utils import add_master_course_staff_to_ccx, assign_staf
from lms.djangoapps.instructor.enrollment import enroll_email, get_email_params
from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
from openedx.core.lib.api import authentication, permissions
from student.models import CourseEnrollment
from student.roles import CourseCcxCoachRole
from common.djangoapps.student.models import CourseEnrollment
from common.djangoapps.student.roles import CourseCcxCoachRole
from xmodule.modulestore.django import SignalHandler
from .paginators import CCXAPIPagination

2
lms/djangoapps/ccx/plugins.py
View File

@@ -6,7 +6,7 @@ Registers the CCX feature for the edX platform.
from django.conf import settings
from django.utils.translation import ugettext_noop
from student.roles import CourseCcxCoachRole
from common.djangoapps.student.roles import CourseCcxCoachRole
from xmodule.tabs import CourseTab
from .permissions import VIEW_CCX_COACH_DASHBOARD

2
lms/djangoapps/ccx/tests/factories.py
View File

@@ -7,7 +7,7 @@ from factory import Sequence, SubFactory
from factory.django import DjangoModelFactory
from lms.djangoapps.ccx.models import CustomCourseForEdX
from student.tests.factories import UserFactory
from common.djangoapps.student.tests.factories import UserFactory
# pylint: disable=missing-class-docstring

2
lms/djangoapps/ccx/tests/test_ccx_modulestore.py
View File

@@ -12,7 +12,7 @@ from ccx_keys.locator import CCXLocator
from six.moves import range, zip_longest
from lms.djangoapps.ccx.models import CustomCourseForEdX
from student.tests.factories import AdminFactory, UserFactory
from common.djangoapps.student.tests.factories import AdminFactory, UserFactory
from xmodule.modulestore.tests.django_utils import TEST_DATA_SPLIT_MODULESTORE, SharedModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory

6
lms/djangoapps/ccx/tests/test_field_override_performance.py
View File

@@ -30,8 +30,8 @@ from lms.djangoapps.courseware.field_overrides import OverrideFieldData
from openedx.core.djangoapps.content.block_structure.api import get_course_in_cache
from openedx.core.djangoapps.waffle_utils.testutils import WAFFLE_TABLES
from openedx.features.content_type_gating.models import ContentTypeGatingConfig
from student.models import CourseEnrollment
from student.tests.factories import UserFactory
from common.djangoapps.student.models import CourseEnrollment
from common.djangoapps.student.tests.factories import UserFactory
from xmodule.modulestore.tests.django_utils import (
TEST_DATA_MONGO_MODULESTORE,
TEST_DATA_SPLIT_MODULESTORE,
@@ -76,7 +76,7 @@ class FieldOverridePerformanceTestCase(FieldOverrideTestMixin, ProceduralCourseT
messages = FallbackStorage(self.request)
self.request._messages = messages # pylint: disable=protected-access
patcher = mock.patch('edxmako.request_context.get_current_request', return_value=self.request)
patcher = mock.patch('common.djangoapps.edxmako.request_context.get_current_request', return_value=self.request)
patcher.start()
self.addCleanup(patcher.stop)
self.course = None

4
lms/djangoapps/ccx/tests/test_models.py
View File

@@ -9,8 +9,8 @@ from datetime import datetime, timedelta
import ddt
from pytz import utc
from student.roles import CourseCcxCoachRole
from student.tests.factories import AdminFactory
from common.djangoapps.student.roles import CourseCcxCoachRole
from common.djangoapps.student.tests.factories import AdminFactory
from xmodule.modulestore.tests.django_utils import TEST_DATA_SPLIT_MODULESTORE, ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory, check_mongo_calls

2
lms/djangoapps/ccx/tests/test_overrides.py
View File

@@ -20,7 +20,7 @@ from lms.djangoapps.ccx.overrides import override_field_for_ccx
from lms.djangoapps.ccx.tests.utils import flatten, iter_blocks
from lms.djangoapps.courseware.field_overrides import OverrideFieldData
from lms.djangoapps.courseware.tests.test_field_overrides import inject_field_overrides
from student.tests.factories import AdminFactory
from common.djangoapps.student.tests.factories import AdminFactory
from xmodule.modulestore.tests.django_utils import TEST_DATA_SPLIT_MODULESTORE, SharedModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory

4
lms/djangoapps/ccx/tests/test_tasks.py
View File

@@ -12,8 +12,8 @@ from ccx_keys.locator import CCXLocator
from lms.djangoapps.ccx.tasks import send_ccx_course_published
from lms.djangoapps.ccx.tests.factories import CcxFactory
from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
from student.roles import CourseCcxCoachRole
from student.tests.factories import AdminFactory
from common.djangoapps.student.roles import CourseCcxCoachRole
from common.djangoapps.student.tests.factories import AdminFactory
from xmodule.modulestore.django import SignalHandler
from xmodule.modulestore.tests.django_utils import TEST_DATA_SPLIT_MODULESTORE, ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

6
lms/djangoapps/ccx/tests/test_utils.py
View File

@@ -13,9 +13,9 @@ from lms.djangoapps.ccx.tests.factories import CcxFactory
from lms.djangoapps.ccx.tests.utils import CcxTestCase
from lms.djangoapps.ccx.utils import add_master_course_staff_to_ccx, ccx_course, remove_master_course_staff_from_ccx
from lms.djangoapps.instructor.access import list_with_level
from student.models import CourseEnrollment, CourseEnrollmentException
from student.roles import CourseCcxCoachRole, CourseInstructorRole, CourseStaffRole
from student.tests.factories import AdminFactory
from common.djangoapps.student.models import CourseEnrollment, CourseEnrollmentException
from common.djangoapps.student.roles import CourseCcxCoachRole, CourseInstructorRole, CourseStaffRole
from common.djangoapps.student.tests.factories import AdminFactory
from xmodule.modulestore.django import modulestore
from xmodule.modulestore.tests.django_utils import TEST_DATA_SPLIT_MODULESTORE, ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

8
lms/djangoapps/ccx/tests/test_views.py
View File

@@ -27,7 +27,7 @@ from lms.djangoapps.courseware.tabs import get_course_tab_list
from lms.djangoapps.courseware.tests.factories import StudentModuleFactory
from lms.djangoapps.courseware.tests.helpers import LoginEnrollmentTestCase
from lms.djangoapps.courseware.testutils import FieldOverrideTestMixin
from edxmako.shortcuts import render_to_response
from common.djangoapps.edxmako.shortcuts import render_to_response
from lms.djangoapps.ccx.models import CustomCourseForEdX
from lms.djangoapps.ccx.overrides import get_override_for_ccx, override_field_for_ccx
from lms.djangoapps.ccx.tests.factories import CcxFactory
@@ -40,9 +40,9 @@ from lms.djangoapps.instructor.access import allow_access, list_with_level
from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
from openedx.core.djangoapps.django_comment_common.models import FORUM_ROLE_ADMINISTRATOR
from openedx.core.djangoapps.django_comment_common.utils import are_permissions_roles_seeded
from student.models import CourseEnrollment, CourseEnrollmentAllowed
from student.roles import CourseCcxCoachRole, CourseInstructorRole, CourseStaffRole
from student.tests.factories import AdminFactory, CourseEnrollmentFactory, UserFactory
from common.djangoapps.student.models import CourseEnrollment, CourseEnrollmentAllowed
from common.djangoapps.student.roles import CourseCcxCoachRole, CourseInstructorRole, CourseStaffRole
from common.djangoapps.student.tests.factories import AdminFactory, CourseEnrollmentFactory, UserFactory
from xmodule.modulestore import ModuleStoreEnum
from xmodule.modulestore.django import modulestore
from xmodule.modulestore.tests.django_utils import (

4
lms/djangoapps/ccx/tests/utils.py
View File

@@ -12,8 +12,8 @@ from six.moves import range
from lms.djangoapps.ccx.overrides import override_field_for_ccx
from lms.djangoapps.ccx.tests.factories import CcxFactory
from openedx.core.djangoapps.ace_common.tests.mixins import EmailTemplateTagMixin
from student.roles import CourseCcxCoachRole, CourseInstructorRole, CourseStaffRole
from student.tests.factories import UserFactory
from common.djangoapps.student.roles import CourseCcxCoachRole, CourseInstructorRole, CourseStaffRole
from common.djangoapps.student.tests.factories import UserFactory
from xmodule.modulestore.django import modulestore
from xmodule.modulestore.tests.django_utils import TEST_DATA_SPLIT_MODULESTORE, SharedModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory

4
lms/djangoapps/ccx/utils.py
View File

@@ -27,8 +27,8 @@ from lms.djangoapps.instructor.enrollment import enroll_email, get_email_params,
from lms.djangoapps.instructor.views.api import _split_input_list
from lms.djangoapps.instructor.views.tools import get_student_from_identifier
from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
from student.models import CourseEnrollment, CourseEnrollmentException
from student.roles import CourseCcxCoachRole, CourseInstructorRole, CourseStaffRole
from common.djangoapps.student.models import CourseEnrollment, CourseEnrollmentException
from common.djangoapps.student.roles import CourseCcxCoachRole, CourseInstructorRole, CourseStaffRole
log = logging.getLogger("edx.ccx")

6
lms/djangoapps/ccx/views.py
View File

@@ -27,7 +27,7 @@ from django.views.decorators.csrf import ensure_csrf_cookie
from opaque_keys.edx.keys import CourseKey
from lms.djangoapps.courseware.courses import get_course_by_id
from edxmako.shortcuts import render_to_response
from common.djangoapps.edxmako.shortcuts import render_to_response
from lms.djangoapps.ccx.models import CustomCourseForEdX
from lms.djangoapps.ccx.overrides import (
bulk_delete_ccx_override_fields,
@@ -54,8 +54,8 @@ from lms.djangoapps.instructor.enrollment import enroll_email, get_email_params
from lms.djangoapps.instructor.views.gradebook_api import get_grade_book_page
from openedx.core.djangoapps.django_comment_common.models import FORUM_ROLE_ADMINISTRATOR, assign_role
from openedx.core.djangoapps.django_comment_common.utils import seed_permissions_roles
from student.models import CourseEnrollment
from student.roles import CourseCcxCoachRole
from common.djangoapps.student.models import CourseEnrollment
from common.djangoapps.student.roles import CourseCcxCoachRole
from xmodule.modulestore.django import SignalHandler
log = logging.getLogger(__name__)

2
lms/djangoapps/certificates/admin.py
View File

@@ -19,7 +19,7 @@ from lms.djangoapps.certificates.models import (
CertificateTemplateAsset,
GeneratedCertificate
)
from util.organizations_helpers import get_organizations
from common.djangoapps.util.organizations_helpers import get_organizations
class CertificateTemplateForm(forms.ModelForm):

2
lms/djangoapps/certificates/api.py
View File

@@ -32,7 +32,7 @@ from lms.djangoapps.certificates.queue import XQueueCertInterface
from lms.djangoapps.instructor.access import list_with_level
from openedx.core.djangoapps.certificates.api import certificates_viewable_for_course
from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
from util.organizations_helpers import get_course_organization_id
from common.djangoapps.util.organizations_helpers import get_course_organization_id
from xmodule.modulestore.django import modulestore
log = logging.getLogger("edx.certificate")

4
lms/djangoapps/certificates/apis/v0/tests/test_views.py
View File

@@ -15,14 +15,14 @@ from mock import patch
from rest_framework import status
from rest_framework.test import APITestCase
from course_modes.models import CourseMode
from common.djangoapps.course_modes.models import CourseMode
from lms.djangoapps.certificates.apis.v0.views import CertificatesDetailView, CertificatesListView
from lms.djangoapps.certificates.models import CertificateStatuses
from lms.djangoapps.certificates.tests.factories import GeneratedCertificateFactory
from openedx.core.djangoapps.content.course_overviews.tests.factories import CourseOverviewFactory
from openedx.core.djangoapps.user_api.tests.factories import UserPreferenceFactory
from openedx.core.djangoapps.user_authn.tests.utils import JWT_AUTH_TYPES, AuthAndScopesTestMixin, AuthType
from student.tests.factories import UserFactory
from common.djangoapps.student.tests.factories import UserFactory
from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

12
lms/djangoapps/certificates/models.py
View File

@@ -71,12 +71,12 @@ from simple_history.models import HistoricalRecords
from lms.djangoapps.badges.events.course_complete import course_badge_check
from lms.djangoapps.badges.events.course_meta import completion_check, course_group_check
from course_modes.models import CourseMode
from common.djangoapps.course_modes.models import CourseMode
from lms.djangoapps.instructor_task.models import InstructorTask
from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
from openedx.core.djangoapps.signals.signals import COURSE_CERT_AWARDED, COURSE_CERT_CHANGED, COURSE_CERT_REVOKED
from openedx.core.djangoapps.xmodule_django.models import NoneToEmptyManager
from util.milestones_helpers import fulfill_course_milestone, is_prerequisite_courses_enabled
from common.djangoapps.util.milestones_helpers import fulfill_course_milestone, is_prerequisite_courses_enabled
LOGGER = logging.getLogger(__name__)
@@ -248,7 +248,7 @@ class GeneratedCertificate(models.Model):
"""
# Import here instead of top of file since this module gets imported before
# the course_modes app is loaded, resulting in a Django deprecation warning.
from course_modes.models import CourseMode
from common.djangoapps.course_modes.models import CourseMode
# Only returns eligible certificates. This should be used in
# preference to the default `objects` manager in most cases.
@@ -619,7 +619,7 @@ def certificate_status(generated_certificate):
"""
# Import here instead of top of file since this module gets imported before
# the course_modes app is loaded, resulting in a Django deprecation warning.
from course_modes.models import CourseMode
from common.djangoapps.course_modes.models import CourseMode
if generated_certificate:
cert_status = {
@@ -650,7 +650,7 @@ def certificate_info_for_user(user, course_id, grade, user_is_whitelisted, user_
"""
Returns the certificate info for a user for grade report.
"""
from student.models import CourseEnrollment
from common.djangoapps.student.models import CourseEnrollment
certificate_is_delivered = 'N'
certificate_type = 'N/A'
@@ -704,7 +704,7 @@ class ExampleCertificateSet(TimeStampedModel):
"""
# Import here instead of top of file since this module gets imported before
# the course_modes app is loaded, resulting in a Django deprecation warning.
from course_modes.models import CourseMode
from common.djangoapps.course_modes.models import CourseMode
cert_set = cls.objects.create(course_key=course_key)
ExampleCertificate.objects.bulk_create([

4
lms/djangoapps/certificates/queue.py
View File

@@ -16,7 +16,7 @@ from lxml.etree import ParserError, XMLSyntaxError
from requests.auth import HTTPBasicAuth
from capa.xqueue_interface import XQueueInterface, make_hashkey, make_xheader
from course_modes.models import CourseMode
from common.djangoapps.course_modes.models import CourseMode
from lms.djangoapps.certificates.models import CertificateStatuses as status
from lms.djangoapps.certificates.models import (
CertificateWhitelist,
@@ -26,7 +26,7 @@ from lms.djangoapps.certificates.models import (
)
from lms.djangoapps.grades.api import CourseGradeFactory
from lms.djangoapps.verify_student.services import IDVerificationService
from student.models import CourseEnrollment, UserProfile
from common.djangoapps.student.models import CourseEnrollment, UserProfile
from xmodule.modulestore.django import modulestore
LOGGER = logging.getLogger(__name__)

4
lms/djangoapps/certificates/signals.py
View File

@@ -9,7 +9,7 @@ import six
from django.db.models.signals import post_save
from django.dispatch import receiver
from course_modes.models import CourseMode
from common.djangoapps.course_modes.models import CourseMode
from lms.djangoapps.certificates.models import (
CertificateGenerationCourseSetting,
CertificateStatuses,
@@ -27,7 +27,7 @@ from openedx.core.djangoapps.signals.signals import (
COURSE_GRADE_NOW_PASSED,
LEARNER_NOW_VERIFIED
)
from student.models import CourseEnrollment
from common.djangoapps.student.models import CourseEnrollment
log = logging.getLogger(__name__)
CERTIFICATE_DELAY_SECONDS = 2

2
lms/djangoapps/certificates/tests/factories.py
View File

@@ -12,7 +12,7 @@ from lms.djangoapps.certificates.models import (
CertificateWhitelist,
GeneratedCertificate
)
from student.models import LinkedInAddToProfileConfiguration
from common.djangoapps.student.models import LinkedInAddToProfileConfiguration
class GeneratedCertificateFactory(DjangoModelFactory):

10
lms/djangoapps/certificates/tests/test_api.py
View File

@@ -19,8 +19,8 @@ from mock import patch
from opaque_keys.edx.keys import CourseKey
from opaque_keys.edx.locator import CourseLocator
from course_modes.models import CourseMode
from course_modes.tests.factories import CourseModeFactory
from common.djangoapps.course_modes.models import CourseMode
from common.djangoapps.course_modes.tests.factories import CourseModeFactory
from lms.djangoapps.certificates import api as certs_api
from lms.djangoapps.certificates.models import (
CertificateGenerationConfiguration,
@@ -34,9 +34,9 @@ from lms.djangoapps.certificates.tests.factories import CertificateInvalidationF
from lms.djangoapps.courseware.tests.factories import GlobalStaffFactory
from lms.djangoapps.grades.tests.utils import mock_passing_grade
from openedx.core.djangoapps.site_configuration.tests.test_util import with_site_configuration
from student.models import CourseEnrollment
from student.tests.factories import UserFactory
from util.testing import EventTestMixin
from common.djangoapps.student.models import CourseEnrollment
from common.djangoapps.student.tests.factories import UserFactory
from common.djangoapps.util.testing import EventTestMixin
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase, SharedModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

4
lms/djangoapps/certificates/tests/test_cert_management.py
View File

@@ -13,10 +13,10 @@ from six.moves import range
from lms.djangoapps.badges.events.course_complete import get_completion_badge
from lms.djangoapps.badges.models import BadgeAssertion
from lms.djangoapps.badges.tests.factories import BadgeAssertionFactory, CourseCompleteImageConfigurationFactory
from course_modes.models import CourseMode
from common.djangoapps.course_modes.models import CourseMode
from lms.djangoapps.certificates.models import CertificateStatuses, GeneratedCertificate
from lms.djangoapps.grades.tests.utils import mock_passing_grade
from student.tests.factories import CourseEnrollmentFactory, UserFactory
from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory, check_mongo_calls

2
lms/djangoapps/certificates/tests/test_create_fake_cert.py
View File

@@ -9,7 +9,7 @@ from opaque_keys.edx.locator import CourseLocator
from six import text_type
from lms.djangoapps.certificates.models import GeneratedCertificate
from student.tests.factories import UserFactory
from common.djangoapps.student.tests.factories import UserFactory
class CreateFakeCertTest(TestCase):

2
lms/djangoapps/certificates/tests/test_models.py
View File

@@ -26,7 +26,7 @@ from lms.djangoapps.certificates.models import (
from lms.djangoapps.certificates.tests.factories import CertificateInvalidationFactory, GeneratedCertificateFactory
from lms.djangoapps.instructor_task.tests.factories import InstructorTaskFactory
from openedx.core.djangoapps.content.course_overviews.tests.factories import CourseOverviewFactory
from student.tests.factories import AdminFactory, UserFactory
from common.djangoapps.student.tests.factories import AdminFactory, UserFactory
from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

4
lms/djangoapps/certificates/tests/test_queue.py
View File

@@ -23,7 +23,7 @@ from testfixtures import LogCapture
# and verify that items are being correctly added to the queue
# in our `XQueueCertInterface` implementation.
from capa.xqueue_interface import XQueueInterface
from course_modes.models import CourseMode
from common.djangoapps.course_modes.models import CourseMode
from lms.djangoapps.certificates.models import (
CertificateStatuses,
ExampleCertificate,
@@ -34,7 +34,7 @@ from lms.djangoapps.certificates.queue import LOGGER, XQueueCertInterface
from lms.djangoapps.certificates.tests.factories import CertificateWhitelistFactory, GeneratedCertificateFactory
from lms.djangoapps.grades.tests.utils import mock_passing_grade
from lms.djangoapps.verify_student.tests.factories import SoftwareSecurePhotoVerificationFactory
from student.tests.factories import CourseEnrollmentFactory, UserFactory
from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

2
lms/djangoapps/certificates/tests/test_services.py
View File

@@ -6,7 +6,7 @@ Unit Tests for the Certificate service
from lms.djangoapps.certificates.models import CertificateStatuses, GeneratedCertificate
from lms.djangoapps.certificates.services import CertificateService
from lms.djangoapps.certificates.tests.factories import GeneratedCertificateFactory
from student.tests.factories import UserFactory
from common.djangoapps.student.tests.factories import UserFactory
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

2
lms/djangoapps/certificates/tests/test_signals.py
View File

@@ -9,7 +9,7 @@ import mock
import six
from edx_toggles.toggles import WaffleSwitch
from edx_toggles.toggles.testutils import override_waffle_switch
from student.tests.factories import CourseEnrollmentFactory, UserFactory
from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

8
lms/djangoapps/certificates/tests/test_support_views.py
View File

@@ -20,9 +20,9 @@ from lms.djangoapps.certificates.models import CertificateInvalidation, Certific
from lms.djangoapps.certificates.tests.factories import CertificateInvalidationFactory
from lms.djangoapps.grades.tests.utils import mock_passing_grade
from openedx.core.djangoapps.content.course_overviews.tests.factories import CourseOverviewFactory
from student.models import CourseEnrollment
from student.roles import GlobalStaff, SupportStaffRole
from student.tests.factories import UserFactory
from common.djangoapps.student.models import CourseEnrollment
from common.djangoapps.student.roles import GlobalStaff, SupportStaffRole
from common.djangoapps.student.tests.factories import UserFactory
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory
@@ -314,7 +314,7 @@ class CertificateRegenerateTests(CertificateSupportTestCase):
self.cert.save()
with mock_passing_grade(percent=0.75):
with patch('course_modes.models.CourseMode.mode_for_course') as mock_mode_for_course:
with patch('common.djangoapps.course_modes.models.CourseMode.mode_for_course') as mock_mode_for_course:
mock_mode_for_course.return_value = 'honor'
api.regenerate_user_certificates(self.student, self.course.id,
course=self.course)

2
lms/djangoapps/certificates/tests/test_tasks.py
View File

@@ -10,7 +10,7 @@ from opaque_keys.edx.keys import CourseKey
from lms.djangoapps.certificates.tasks import generate_certificate
from lms.djangoapps.verify_student.models import IDVerificationAttempt
from student.tests.factories import UserFactory
from common.djangoapps.student.tests.factories import UserFactory
@ddt.ddt

2
lms/djangoapps/certificates/tests/test_views.py
View File

@@ -24,7 +24,7 @@ from lms.djangoapps.certificates.models import (
)
from openedx.core.djangoapps.site_configuration.tests.test_util import with_site_configuration
from openedx.core.djangolib.testing.utils import CacheIsolationTestCase
from student.tests.factories import UserFactory
from common.djangoapps.student.tests.factories import UserFactory
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

12
lms/djangoapps/certificates/tests/test_webview_views.py
View File

@@ -16,7 +16,7 @@ from django.urls import reverse
from mock import patch
from urllib.parse import urlencode
from course_modes.models import CourseMode
from common.djangoapps.course_modes.models import CourseMode
from edx_toggles.toggles import WaffleSwitch
from edx_toggles.toggles.testutils import override_waffle_switch
from lms.djangoapps.badges.events.course_complete import get_completion_badge
@@ -50,11 +50,11 @@ from openedx.core.djangoapps.site_configuration.tests.test_util import (
from openedx.core.djangolib.js_utils import js_escaped_string
from openedx.core.djangolib.testing.utils import CacheIsolationTestCase
from openedx.core.lib.tests.assertions.events import assert_event_matches
from student.roles import CourseStaffRole
from student.tests.factories import CourseEnrollmentFactory, UserFactory
from track.tests import EventTrackingTestCase
from util import organizations_helpers as organizations_api
from util.date_utils import strftime_localized
from common.djangoapps.student.roles import CourseStaffRole
from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
from common.djangoapps.track.tests import EventTrackingTestCase
from common.djangoapps.util import organizations_helpers as organizations_api
from common.djangoapps.util.date_utils import strftime_localized
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

6
lms/djangoapps/certificates/tests/tests.py
View File

@@ -20,9 +20,9 @@ from lms.djangoapps.certificates.models import (
certificate_status_for_student
)
from lms.djangoapps.certificates.tests.factories import GeneratedCertificateFactory
from student.models import CourseEnrollment
from student.tests.factories import CourseEnrollmentFactory, UserFactory
from util.milestones_helpers import milestones_achieved_by_user, set_prerequisite_courses
from common.djangoapps.student.models import CourseEnrollment
from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
from common.djangoapps.util.milestones_helpers import milestones_achieved_by_user, set_prerequisite_courses
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

4
lms/djangoapps/certificates/views/support.py
View File

@@ -24,8 +24,8 @@ from lms.djangoapps.certificates.models import CertificateInvalidation
from lms.djangoapps.certificates.permissions import GENERATE_ALL_CERTIFICATES, VIEW_ALL_CERTIFICATES
from lms.djangoapps.instructor_task.api import generate_certificates_for_students
from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
from student.models import CourseEnrollment, User
from util.json_request import JsonResponse
from common.djangoapps.student.models import CourseEnrollment, User
from common.djangoapps.util.json_request import JsonResponse
from xmodule.modulestore.django import modulestore
log = logging.getLogger(__name__)

12
lms/djangoapps/certificates/views/webview.py
View File

@@ -23,8 +23,8 @@ from opaque_keys.edx.keys import CourseKey
from lms.djangoapps.badges.events.course_complete import get_completion_badge
from lms.djangoapps.badges.utils import badges_enabled
from edxmako.shortcuts import render_to_response
from edxmako.template import Template
from common.djangoapps.edxmako.shortcuts import render_to_response
from common.djangoapps.edxmako.template import Template
from lms.djangoapps.certificates.api import (
emit_certificate_event,
get_active_web_certificate,
@@ -47,10 +47,10 @@ from openedx.core.djangoapps.certificates.api import certificates_viewable_for_c
from openedx.core.djangoapps.lang_pref.api import get_closest_released_language
from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
from openedx.core.lib.courses import course_image_url
from student.models import LinkedInAddToProfileConfiguration
from util import organizations_helpers as organization_api
from util.date_utils import strftime_localized
from util.views import handle_500
from common.djangoapps.student.models import LinkedInAddToProfileConfiguration
from common.djangoapps.util import organizations_helpers as organization_api
from common.djangoapps.util.date_utils import strftime_localized
from common.djangoapps.util.views import handle_500
log = logging.getLogger(__name__)
_ = translation.ugettext

4
lms/djangoapps/certificates/views/xqueue.py
View File

@@ -21,8 +21,8 @@ from lms.djangoapps.certificates.models import (
GeneratedCertificate,
certificate_status_for_student
)
from util.json_request import JsonResponse, JsonResponseBadRequest
from util.request_rate_limiter import BadRequestRateLimiter
from common.djangoapps.util.json_request import JsonResponse, JsonResponseBadRequest
from common.djangoapps.util.request_rate_limiter import BadRequestRateLimiter
from xmodule.modulestore.django import modulestore
log = logging.getLogger(__name__)

8
lms/djangoapps/commerce/api/v0/tests/test_views.py
View File

@@ -15,13 +15,13 @@ from django.test import TestCase
from django.test.utils import override_settings
from django.urls import reverse, reverse_lazy
from course_modes.models import CourseMode
from course_modes.tests.factories import CourseModeFactory
from common.djangoapps.course_modes.models import CourseMode
from common.djangoapps.course_modes.tests.factories import CourseModeFactory
from openedx.core.djangoapps.embargo.test_utils import restrict_course
from openedx.core.djangoapps.enrollments.api import get_enrollment
from openedx.core.lib.django_test_client_utils import get_absolute_url
from student.models import CourseEnrollment
from student.tests.tests import EnrollmentEventTestMixin
from common.djangoapps.student.models import CourseEnrollment
from common.djangoapps.student.tests.tests import EnrollmentEventTestMixin
from xmodule.modulestore.django import modulestore
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

10
lms/djangoapps/commerce/api/v0/views.py
View File

@@ -15,18 +15,18 @@ from rest_framework.status import HTTP_406_NOT_ACCEPTABLE, HTTP_409_CONFLICT
from rest_framework.views import APIView
from six import text_type
from course_modes.models import CourseMode
from common.djangoapps.course_modes.models import CourseMode
from lms.djangoapps.courseware import courses
from entitlements.models import CourseEntitlement
from common.djangoapps.entitlements.models import CourseEntitlement
from openedx.core.djangoapps.commerce.utils import ecommerce_api_client
from openedx.core.djangoapps.embargo import api as embargo_api
from openedx.core.djangoapps.enrollments.api import add_enrollment
from openedx.core.djangoapps.enrollments.views import EnrollmentCrossDomainSessionAuth
from openedx.core.djangoapps.user_api.preferences.api import update_email_opt_in
from openedx.core.lib.api.authentication import BearerAuthenticationAllowInactiveUser
from student.models import CourseEnrollment
from student.signals import SAILTHRU_AUDIT_PURCHASE
from util.json_request import JsonResponse
from common.djangoapps.student.models import CourseEnrollment
from common.djangoapps.student.signals import SAILTHRU_AUDIT_PURCHASE
from common.djangoapps.util.json_request import JsonResponse
from ...constants import Messages
from ...http import DetailResponse

2
lms/djangoapps/commerce/api/v1/models.py
View File

@@ -9,7 +9,7 @@ from django.db import transaction
from opaque_keys import InvalidKeyError
from opaque_keys.edx.keys import CourseKey
from course_modes.models import CourseMode
from common.djangoapps.course_modes.models import CourseMode
from lms.djangoapps.verify_student.models import VerificationDeadline
from openedx.core.djangoapps.content.course_overviews.models import CourseOverview

2
lms/djangoapps/commerce/api/v1/serializers.py
View File

@@ -10,7 +10,7 @@ from opaque_keys import InvalidKeyError
from opaque_keys.edx.keys import CourseKey
from rest_framework import serializers
from course_modes.models import CourseMode
from common.djangoapps.course_modes.models import CourseMode
from xmodule.modulestore.django import modulestore
from .models import UNDEFINED, Course

2
lms/djangoapps/commerce/api/v1/tests/test_models.py
View File

@@ -4,7 +4,7 @@
import ddt
from django.test import TestCase
from course_modes.models import CourseMode
from common.djangoapps.course_modes.models import CourseMode
from ..models import Course

4
lms/djangoapps/commerce/api/v1/tests/test_views.py
View File

@@ -15,9 +15,9 @@ from django.test.utils import override_settings
from django.urls import reverse, reverse_lazy
from rest_framework.utils.encoders import JSONEncoder
from course_modes.models import CourseMode
from common.djangoapps.course_modes.models import CourseMode
from lms.djangoapps.verify_student.models import VerificationDeadline
from student.tests.factories import UserFactory
from common.djangoapps.student.tests.factories import UserFactory
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

4
lms/djangoapps/commerce/api/v1/views.py
View File

@@ -15,10 +15,10 @@ from rest_framework.permissions import IsAuthenticated
from rest_framework.views import APIView
from openedx.core.lib.api.authentication import BearerAuthentication
from course_modes.models import CourseMode
from common.djangoapps.course_modes.models import CourseMode
from openedx.core.djangoapps.commerce.utils import ecommerce_api_client
from openedx.core.lib.api.mixins import PutAsCreateMixin
from util.json_request import JsonResponse
from common.djangoapps.util.json_request import JsonResponse
from ...utils import is_account_activation_requirement_disabled
from .models import Course

2
lms/djangoapps/commerce/http.py
View File

@@ -3,7 +3,7 @@
from rest_framework.status import HTTP_200_OK, HTTP_500_INTERNAL_SERVER_ERROR
from util.json_request import JsonResponse
from common.djangoapps.util.json_request import JsonResponse
class DetailResponse(JsonResponse):

4
lms/djangoapps/commerce/management/commands/create_orders_for_old_enterprise_course_enrollment.py
View File

@@ -18,10 +18,10 @@ from requests import Timeout
from slumber.exceptions import HttpServerError, SlumberBaseException
from enterprise.models import EnterpriseCourseEnrollment
from student.models import CourseEnrollment
from common.djangoapps.student.models import CourseEnrollment
from openedx.core.djangoapps.commerce.utils import ecommerce_api_client
from util.query import use_read_replica_if_available
from common.djangoapps.util.query import use_read_replica_if_available
User = get_user_model()

4
lms/djangoapps/commerce/management/commands/tests/test_create_orders_for_old_enterprise_course_enrollmnet.py
View File

@@ -10,8 +10,8 @@ from django.utils.six import StringIO
from mock import patch
from six.moves import range
from course_modes.models import CourseMode
from student.tests.factories import UserFactory, CourseEnrollmentFactory
from common.djangoapps.course_modes.models import CourseMode
from common.djangoapps.student.tests.factories import UserFactory, CourseEnrollmentFactory
from openedx.core.djangoapps.credit.tests.test_api import TEST_ECOMMERCE_WORKER
from openedx.core.djangolib.testing.utils import skip_unless_lms
from openedx.features.enterprise_support.tests.factories import (

2
lms/djangoapps/commerce/signals.py
View File

@@ -10,7 +10,7 @@ from django.contrib.auth.models import AnonymousUser
from django.dispatch import receiver
from openedx.core.djangoapps.commerce.utils import is_commerce_service_configured
from student.signals import REFUND_ORDER
from common.djangoapps.student.signals import REFUND_ORDER
from .utils import refund_seat

2
lms/djangoapps/commerce/tests/__init__.py
View File

@@ -10,7 +10,7 @@ from freezegun import freeze_time
from openedx.core.djangoapps.commerce.utils import ecommerce_api_client
from openedx.core.djangoapps.oauth_dispatch.jwt import create_jwt_for_user
from student.tests.factories import UserFactory
from common.djangoapps.student.tests.factories import UserFactory
JSON = 'application/json'
TEST_PUBLIC_URL_ROOT = 'http://www.example.com'

6
lms/djangoapps/commerce/tests/test_signals.py
View File

@@ -18,9 +18,9 @@ from opaque_keys.edx.keys import CourseKey
from requests import Timeout
from six.moves.urllib.parse import urljoin
from course_modes.models import CourseMode
from student.signals import REFUND_ORDER
from student.tests.factories import CourseEnrollmentFactory, UserFactory
from common.djangoapps.course_modes.models import CourseMode
from common.djangoapps.student.signals import REFUND_ORDER
from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
from ..models import CommerceConfiguration
from ..utils import _generate_refund_notification_body, _send_refund_notification, create_zendesk_ticket

10
lms/djangoapps/commerce/tests/test_utils.py
View File

@@ -14,20 +14,20 @@ from opaque_keys.edx.locator import CourseLocator
from six.moves.urllib.parse import urlencode
from waffle.testutils import override_switch
from course_modes.models import CourseMode
from course_modes.tests.factories import CourseModeFactory
from common.djangoapps.course_modes.models import CourseMode
from common.djangoapps.course_modes.tests.factories import CourseModeFactory
from lms.djangoapps.commerce.models import CommerceConfiguration
from lms.djangoapps.commerce.utils import EcommerceService, refund_entitlement, refund_seat
from openedx.core.djangolib.testing.utils import skip_unless_lms
from openedx.core.lib.log_utils import audit_log
from student.models import CourseEnrollment
from student.tests.factories import TEST_PASSWORD, UserFactory
from common.djangoapps.student.models import CourseEnrollment
from common.djangoapps.student.tests.factories import TEST_PASSWORD, UserFactory
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory
# Entitlements is not in CMS' INSTALLED_APPS so these imports will error during test collection
if settings.ROOT_URLCONF == 'lms.urls':
from entitlements.tests.factories import CourseEntitlementFactory
from common.djangoapps.entitlements.tests.factories import CourseEntitlementFactory
def update_commerce_config(enabled=False, checkout_page='/test_basket/add/'):

2
lms/djangoapps/commerce/tests/test_views.py
View File

@@ -1,6 +1,6 @@
""" Tests for commerce views. """
from student.tests.factories import UserFactory
from common.djangoapps.student.tests.factories import UserFactory
class UserMixin(object):

4
lms/djangoapps/commerce/utils.py
View File

@@ -14,11 +14,11 @@ from django.utils.translation import ugettext as _
from opaque_keys.edx.keys import CourseKey
from six.moves.urllib.parse import urlencode, urljoin
from course_modes.models import CourseMode
from common.djangoapps.course_modes.models import CourseMode
from openedx.core.djangoapps.commerce.utils import ecommerce_api_client, is_commerce_service_configured
from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
from openedx.core.djangoapps.theming import helpers as theming_helpers
from student.models import CourseEnrollment
from common.djangoapps.student.models import CourseEnrollment
from .models import CommerceConfiguration

4
lms/djangoapps/course_api/api.py
View File

@@ -21,8 +21,8 @@ from lms.djangoapps.courseware.courses import (
from opaque_keys.edx.django.models import CourseKeyField
from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
from openedx.core.lib.api.view_utils import LazySequence
from student.models import CourseAccessRole
from student.roles import GlobalStaff
from common.djangoapps.student.models import CourseAccessRole
from common.djangoapps.student.roles import GlobalStaff
from xmodule.modulestore.django import modulestore
from xmodule.modulestore.exceptions import ItemNotFoundError

4
lms/djangoapps/course_api/blocks/permissions.py
View File

@@ -8,8 +8,8 @@ from lms.djangoapps.courseware.access import has_access
from lms.djangoapps.courseware.access_response import AccessResponse
from lms.djangoapps.courseware.access_utils import ACCESS_DENIED, ACCESS_GRANTED, check_public_access
from lms.djangoapps.courseware.courses import get_course
from student.models import CourseEnrollment
from student.roles import CourseStaffRole
from common.djangoapps.student.models import CourseEnrollment
from common.djangoapps.student.roles import CourseStaffRole
from xmodule.course_module import COURSE_VISIBILITY_PUBLIC

4
lms/djangoapps/course_api/blocks/tests/test_api.py
View File

@@ -10,12 +10,12 @@ import six
from django.test.client import RequestFactory
from edx_toggles.toggles.testutils import override_waffle_switch
from mock import patch
from student.tests.factories import UserFactory
from common.djangoapps.student.tests.factories import UserFactory
from xmodule.modulestore import ModuleStoreEnum
from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
from xmodule.modulestore.tests.factories import SampleCourseFactory, check_mongo_calls
from xmodule.modulestore.tests.sample_courses import BlockInfo
from openedx.core.djangoapps.content.block_structure.api import clear_course_from_cache
from openedx.core.djangoapps.content.block_structure.config import STORAGE_BACKING_FOR_CACHE, waffle_switch

4
lms/djangoapps/course_api/blocks/tests/test_forms.py
View File

@@ -11,8 +11,8 @@ from opaque_keys.edx.locator import CourseLocator
from rest_framework.exceptions import PermissionDenied
from openedx.core.djangoapps.util.test_forms import FormTestMixin
from student.models import CourseEnrollment
from student.tests.factories import CourseEnrollmentFactory, UserFactory
from common.djangoapps.student.models import CourseEnrollment
from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

4
lms/djangoapps/course_api/blocks/tests/test_serializers.py
View File

@@ -8,8 +8,8 @@ from mock import MagicMock
from lms.djangoapps.course_blocks.api import get_course_block_access_transformers, get_course_blocks
from openedx.core.djangoapps.content.block_structure.transformers import BlockStructureTransformers
from student.roles import CourseStaffRole
from student.tests.factories import UserFactory
from common.djangoapps.student.roles import CourseStaffRole
from common.djangoapps.student.tests.factories import UserFactory
from xmodule.modulestore import ModuleStoreEnum
from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
from xmodule.modulestore.tests.factories import ToyCourseFactory

4
lms/djangoapps/course_api/blocks/tests/test_views.py
View File

@@ -12,8 +12,8 @@ from django.conf import settings
from django.urls import reverse
from opaque_keys.edx.locator import CourseLocator
from student.models import CourseEnrollment
from student.tests.factories import AdminFactory, CourseEnrollmentFactory, UserFactory
from common.djangoapps.student.models import CourseEnrollment
from common.djangoapps.student.tests.factories import AdminFactory, CourseEnrollmentFactory, UserFactory
from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
from xmodule.modulestore.tests.factories import ToyCourseFactory

4
lms/djangoapps/course_api/blocks/transformers/milestones.py
View File

@@ -11,8 +11,8 @@ from edx_proctoring.api import get_attempt_status_summary
from edx_proctoring.exceptions import ProctoredExamNotFoundException
from openedx.core.djangoapps.content.block_structure.transformer import BlockStructureTransformer
from student.models import EntranceExamConfiguration
from util import milestones_helpers
from common.djangoapps.student.models import EntranceExamConfiguration
from common.djangoapps.util import milestones_helpers
log = logging.getLogger(__name__)

2
lms/djangoapps/course_api/blocks/transformers/tests/test_block_completion.py
View File

@@ -11,7 +11,7 @@ from xblock.core import XBlock
from lms.djangoapps.course_api.blocks.transformers.block_completion import BlockCompletionTransformer
from lms.djangoapps.course_blocks.api import get_course_blocks
from lms.djangoapps.course_blocks.transformers.tests.helpers import ModuleStoreTestCase, TransformerRegistryTestMixin
from student.tests.factories import UserFactory
from common.djangoapps.student.tests.factories import UserFactory
from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory

2
lms/djangoapps/course_api/blocks/transformers/tests/test_milestones.py
View File

@@ -13,7 +13,7 @@ from lms.djangoapps.course_blocks.api import get_course_blocks
from lms.djangoapps.course_blocks.transformers.tests.helpers import CourseStructureTestCase
from openedx.core.djangoapps.content.block_structure.transformers import BlockStructureTransformers
from openedx.core.lib.gating import api as gating_api
from student.tests.factories import CourseEnrollmentFactory
from common.djangoapps.student.tests.factories import CourseEnrollmentFactory
from ..milestones import MilestonesAndSpecialExamsTransformer

2
lms/djangoapps/course_api/permissions.py
View File

@@ -3,7 +3,7 @@ Course API Authorization functions
"""
from student.roles import GlobalStaff
from common.djangoapps.student.roles import GlobalStaff
def can_view_courses_for_username(requesting_user, target_username):

2
lms/djangoapps/course_api/tests/mixins.py
View File

@@ -5,7 +5,7 @@ Common mixins for Course API Tests
from datetime import datetime
from student.tests.factories import UserFactory
from common.djangoapps.student.tests.factories import UserFactory
from xmodule.modulestore.tests.factories import ToyCourseFactory
TEST_PASSWORD = u'edx'

2
lms/djangoapps/course_api/tests/test_forms.py
View File

@@ -11,7 +11,7 @@ from django.contrib.auth.models import AnonymousUser
from django.http import QueryDict
from openedx.core.djangoapps.util.test_forms import FormTestMixin
from student.tests.factories import UserFactory
from common.djangoapps.student.tests.factories import UserFactory
from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

10
lms/djangoapps/course_api/tests/test_views.py
View File

@@ -20,15 +20,15 @@ from search.tests.tests import TEST_INDEX_NAME
from search.tests.utils import SearcherMixin
from waffle.testutils import override_switch
from course_modes.models import CourseMode
from course_modes.tests.factories import CourseModeFactory
from common.djangoapps.course_modes.models import CourseMode
from common.djangoapps.course_modes.tests.factories import CourseModeFactory
from opaque_keys.edx.locator import LibraryLocator
from openedx.core.lib.api.view_utils import LazySequence
from openedx.features.content_type_gating.models import ContentTypeGatingConfig
from openedx.features.course_duration_limits.models import CourseDurationLimitConfig
from student.auth import add_users
from student.roles import CourseInstructorRole, CourseStaffRole
from student.tests.factories import AdminFactory
from common.djangoapps.student.auth import add_users
from common.djangoapps.student.roles import CourseInstructorRole, CourseStaffRole
from common.djangoapps.student.tests.factories import AdminFactory
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase, SharedModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

2
lms/djangoapps/course_blocks/transformers/library_content.py
View File

@@ -14,7 +14,7 @@ from openedx.core.djangoapps.content.block_structure.transformer import (
BlockStructureTransformer,
FilteringTransformerMixin
)
from track import contexts
from common.djangoapps.track import contexts
from xmodule.library_content_module import LibraryContentBlock
from xmodule.modulestore.django import modulestore

4
lms/djangoapps/course_blocks/transformers/tests/helpers.py
View File

@@ -7,11 +7,11 @@ import six
from six.moves import range
from mock import patch
from course_modes.models import CourseMode
from common.djangoapps.course_modes.models import CourseMode
from lms.djangoapps.courseware.access import has_access
from openedx.core.djangoapps.content.block_structure.tests.helpers import clear_registered_transformers_cache
from openedx.core.djangoapps.content.block_structure.transformers import BlockStructureTransformers
from student.tests.factories import CourseEnrollmentFactory, UserFactory
from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
from xmodule.modulestore import ModuleStoreEnum
from xmodule.modulestore.django import modulestore
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase

2
lms/djangoapps/course_blocks/transformers/tests/test_library_content.py
View File

@@ -8,7 +8,7 @@ import mock
from openedx.core.djangoapps.content.block_structure.api import clear_course_from_cache
from openedx.core.djangoapps.content.block_structure.transformers import BlockStructureTransformers
from student.tests.factories import CourseEnrollmentFactory
from common.djangoapps.student.tests.factories import CourseEnrollmentFactory
from ...api import get_course_blocks
from ..library_content import ContentLibraryTransformer, ContentLibraryOrderTransformer

2
lms/djangoapps/course_blocks/transformers/tests/test_load_override_data.py
View File

@@ -11,7 +11,7 @@ import pytz
from lms.djangoapps.course_blocks.transformers.load_override_data import REQUESTED_FIELDS, OverrideDataTransformer
from lms.djangoapps.courseware.student_field_overrides import get_override_for_user, override_field_for_user
from openedx.core.djangoapps.content.block_structure.factory import BlockStructureFactory
from student.tests.factories import CourseEnrollmentFactory, UserFactory
from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
from xmodule.modulestore.django import modulestore
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import ToyCourseFactory

2
lms/djangoapps/course_blocks/transformers/tests/test_split_test.py
View File

@@ -7,7 +7,7 @@ import ddt
import openedx.core.djangoapps.user_api.course_tag.api as course_tag_api
from openedx.core.djangoapps.user_api.partition_schemes import RandomUserPartitionScheme
from student.tests.factories import CourseEnrollmentFactory
from common.djangoapps.student.tests.factories import CourseEnrollmentFactory
from xmodule.modulestore.tests.factories import check_mongo_calls
from xmodule.partitions.partitions import Group, UserPartition
from xmodule.partitions.partitions_service import get_user_partition_groups

4
lms/djangoapps/course_blocks/transformers/tests/test_user_partitions.py
View File

@@ -13,14 +13,14 @@ import six
from six.moves import range
from mock import patch
from course_modes.tests.factories import CourseModeFactory
from common.djangoapps.course_modes.tests.factories import CourseModeFactory
from openedx.core.djangoapps.course_groups.cohorts import add_user_to_cohort
from openedx.core.djangoapps.course_groups.partition_scheme import CohortPartitionScheme
from openedx.core.djangoapps.course_groups.tests.helpers import CohortFactory, config_course_cohorts
from openedx.core.djangoapps.course_groups.views import link_cohort_to_partition_group
from openedx.features.content_type_gating.models import ContentTypeGatingConfig
from openedx.features.content_type_gating.partitions import create_content_gating_partition
from student.tests.factories import CourseEnrollmentFactory
from common.djangoapps.student.tests.factories import CourseEnrollmentFactory
from xmodule.modulestore.tests.factories import CourseFactory
from xmodule.partitions.partitions import Group, UserPartition

2
lms/djangoapps/course_goals/api.py
View File

@@ -8,7 +8,7 @@ from opaque_keys.edx.keys import CourseKey
from rest_framework.reverse import reverse
from six import text_type
from course_modes.models import CourseMode
from common.djangoapps.course_modes.models import CourseMode
from openedx.features.course_experience import ENABLE_COURSE_GOALS
from . import models

4
lms/djangoapps/course_goals/handlers.py
View File

@@ -8,8 +8,8 @@ from django.db import models
from django.dispatch import receiver
import six
from course_modes.models import CourseMode
from student.models import CourseEnrollment
from common.djangoapps.course_modes.models import CourseMode
from common.djangoapps.student.models import CourseEnrollment
from .api import add_course_goal, remove_course_goal
from .models import GOAL_KEY_CHOICES

4
lms/djangoapps/course_goals/tests/test_api.py
View File

@@ -10,8 +10,8 @@ from django.urls import reverse
from rest_framework.test import APIClient
from lms.djangoapps.course_goals.models import CourseGoal
from student.models import CourseEnrollment
from track.tests import EventTrackingTestCase
from common.djangoapps.student.models import CourseEnrollment
from common.djangoapps.track.tests import EventTrackingTestCase
from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

2
lms/djangoapps/course_goals/views.py
View File

@@ -15,7 +15,7 @@ from rest_framework.authentication import SessionAuthentication
from rest_framework.response import Response
from openedx.core.lib.api.permissions import IsStaffOrOwner
from track import segment
from common.djangoapps.track import segment
from .api import get_course_goal_options
from .models import GOAL_KEY_CHOICES, CourseGoal

Some files were not shown because too many files have changed in this diff Show More