Use full names for common.djangoapps imports; warn when using old style (#25477)
* 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:
@@ -12,9 +12,9 @@ from opaque_keys.edx.locator import CourseLocator
|
||||
|
||||
from cms.djangoapps.contentstore.tasks import rerun_course
|
||||
from cms.djangoapps.contentstore.tests.utils import CourseTestCase
|
||||
from course_action_state.managers import CourseRerunUIStateManager
|
||||
from course_action_state.models import CourseRerunState
|
||||
from student.auth import has_course_author_access
|
||||
from common.djangoapps.course_action_state.managers import CourseRerunUIStateManager
|
||||
from common.djangoapps.course_action_state.models import CourseRerunState
|
||||
from common.djangoapps.student.auth import has_course_author_access
|
||||
from xmodule.contentstore.content import StaticContent
|
||||
from xmodule.contentstore.django import contentstore
|
||||
from xmodule.modulestore import EdxJSONEncoder, ModuleStoreEnum
|
||||
|
||||
@@ -34,13 +34,13 @@ from cms.djangoapps.contentstore.config import waffle
|
||||
from cms.djangoapps.contentstore.tests.utils import AjaxEnabledTestClient, CourseTestCase, get_url, parse_json
|
||||
from cms.djangoapps.contentstore.utils import delete_course, reverse_course_url, reverse_url
|
||||
from cms.djangoapps.contentstore.views.component import ADVANCED_COMPONENT_TYPES
|
||||
from course_action_state.managers import CourseActionStateItemNotFoundError
|
||||
from course_action_state.models import CourseRerunState, CourseRerunUIStateManager
|
||||
from common.djangoapps.course_action_state.managers import CourseActionStateItemNotFoundError
|
||||
from common.djangoapps.course_action_state.models import CourseRerunState, CourseRerunUIStateManager
|
||||
from openedx.core.djangoapps.django_comment_common.utils import are_permissions_roles_seeded
|
||||
from openedx.core.lib.tempdir import mkdtemp_clean
|
||||
from student import auth
|
||||
from student.models import CourseEnrollment
|
||||
from student.roles import CourseCreatorRole, CourseInstructorRole
|
||||
from common.djangoapps.student import auth
|
||||
from common.djangoapps.student.models import CourseEnrollment
|
||||
from common.djangoapps.student.roles import CourseCreatorRole, CourseInstructorRole
|
||||
from xmodule.capa_module import ProblemBlock
|
||||
from xmodule.contentstore.content import StaticContent
|
||||
from xmodule.contentstore.django import contentstore
|
||||
|
||||
@@ -13,9 +13,9 @@ from mock import patch
|
||||
from opaque_keys.edx.keys import CourseKey
|
||||
|
||||
from cms.djangoapps.contentstore.tests.utils import AjaxEnabledTestClient, parse_json
|
||||
from student.roles import CourseInstructorRole, CourseStaffRole
|
||||
from student.tests.factories import UserFactory
|
||||
from util.organizations_helpers import add_organization, get_course_organizations
|
||||
from common.djangoapps.student.roles import CourseInstructorRole, CourseStaffRole
|
||||
from common.djangoapps.student.tests.factories import UserFactory
|
||||
from common.djangoapps.util.organizations_helpers import add_organization, get_course_organizations
|
||||
from xmodule.course_module import CourseFields
|
||||
from xmodule.modulestore import ModuleStoreEnum
|
||||
from xmodule.modulestore.django import modulestore
|
||||
|
||||
@@ -23,8 +23,8 @@ from cms.djangoapps.contentstore.views.course import (
|
||||
_accessible_courses_summary_iter,
|
||||
get_courses_accessible_to_user
|
||||
)
|
||||
from course_action_state.models import CourseRerunState
|
||||
from student.roles import (
|
||||
from common.djangoapps.course_action_state.models import CourseRerunState
|
||||
from common.djangoapps.student.roles import (
|
||||
CourseInstructorRole,
|
||||
CourseStaffRole,
|
||||
GlobalStaff,
|
||||
@@ -32,7 +32,7 @@ from student.roles import (
|
||||
OrgStaffRole,
|
||||
UserBasedRole
|
||||
)
|
||||
from student.tests.factories import UserFactory
|
||||
from common.djangoapps.student.tests.factories import UserFactory
|
||||
from xmodule.course_module import CourseSummary
|
||||
from xmodule.modulestore import ModuleStoreEnum
|
||||
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
|
||||
|
||||
@@ -30,12 +30,12 @@ from cms.djangoapps.models.settings.course_grading import (
|
||||
from cms.djangoapps.models.settings.course_metadata import CourseMetadata
|
||||
from cms.djangoapps.models.settings.encoder import CourseSettingsEncoder
|
||||
from cms.djangoapps.models.settings.waffle import MATERIAL_RECOMPUTE_ONLY_FLAG
|
||||
from course_modes.models import CourseMode
|
||||
from common.djangoapps.course_modes.models import CourseMode
|
||||
from openedx.core.djangoapps.models.course_details import CourseDetails
|
||||
from student.roles import CourseInstructorRole, CourseStaffRole
|
||||
from student.tests.factories import UserFactory
|
||||
from util import milestones_helpers
|
||||
from xblock_django.models import XBlockStudioConfigurationFlag
|
||||
from common.djangoapps.student.roles import CourseInstructorRole, CourseStaffRole
|
||||
from common.djangoapps.student.tests.factories import UserFactory
|
||||
from common.djangoapps.util import milestones_helpers
|
||||
from common.djangoapps.xblock_django.models import XBlockStudioConfigurationFlag
|
||||
from xmodule.fields import Date
|
||||
from xmodule.modulestore import ModuleStoreEnum
|
||||
from xmodule.modulestore.django import modulestore
|
||||
@@ -514,7 +514,7 @@ class CourseGradingTest(CourseTestCase):
|
||||
subgrader = CourseGradingModel.fetch_grader(self.course.id, i)
|
||||
self.assertDictEqual(grader, subgrader, str(i) + "th graders not equal")
|
||||
|
||||
@mock.patch('track.event_transaction_utils.uuid4')
|
||||
@mock.patch('common.djangoapps.track.event_transaction_utils.uuid4')
|
||||
@mock.patch('cms.djangoapps.models.settings.course_grading.tracker')
|
||||
@mock.patch('cms.djangoapps.contentstore.signals.signals.GRADING_POLICY_CHANGED.send')
|
||||
@ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split)
|
||||
@@ -651,7 +651,7 @@ class CourseGradingTest(CourseTestCase):
|
||||
)
|
||||
self.assertTrue(result)
|
||||
|
||||
@mock.patch('track.event_transaction_utils.uuid4')
|
||||
@mock.patch('common.djangoapps.track.event_transaction_utils.uuid4')
|
||||
@mock.patch('cms.djangoapps.models.settings.course_grading.tracker')
|
||||
@mock.patch('cms.djangoapps.contentstore.signals.signals.GRADING_POLICY_CHANGED.send')
|
||||
def test_update_grader_from_json(self, send_signal, tracker, uuid):
|
||||
@@ -696,7 +696,7 @@ class CourseGradingTest(CourseTestCase):
|
||||
) for policy_hash in {grading_policy_2, grading_policy_3}
|
||||
], any_order=True)
|
||||
|
||||
@mock.patch('track.event_transaction_utils.uuid4')
|
||||
@mock.patch('common.djangoapps.track.event_transaction_utils.uuid4')
|
||||
@mock.patch('cms.djangoapps.models.settings.course_grading.tracker')
|
||||
def test_update_cutoffs_from_json(self, tracker, uuid):
|
||||
uuid.return_value = 'mockUUID'
|
||||
@@ -757,7 +757,7 @@ class CourseGradingTest(CourseTestCase):
|
||||
# Once deleted, the grace period should simply be None
|
||||
self.assertEqual(None, altered_grader.grace_period, "Delete grace period")
|
||||
|
||||
@mock.patch('track.event_transaction_utils.uuid4')
|
||||
@mock.patch('common.djangoapps.track.event_transaction_utils.uuid4')
|
||||
@mock.patch('cms.djangoapps.models.settings.course_grading.tracker')
|
||||
@mock.patch('cms.djangoapps.contentstore.signals.signals.GRADING_POLICY_CHANGED.send')
|
||||
def test_update_section_grader_type(self, send_signal, tracker, uuid):
|
||||
|
||||
@@ -30,8 +30,8 @@ from cms.djangoapps.contentstore.signals.handlers import listen_for_course_publi
|
||||
from cms.djangoapps.contentstore.tasks import update_search_index
|
||||
from cms.djangoapps.contentstore.tests.utils import CourseTestCase
|
||||
from cms.djangoapps.contentstore.utils import reverse_course_url, reverse_usage_url
|
||||
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.models.course_details import CourseDetails
|
||||
from xmodule.library_tools import normalize_key_for_search
|
||||
from xmodule.modulestore import ModuleStoreEnum
|
||||
|
||||
@@ -16,9 +16,9 @@ from cms.djangoapps.contentstore.views.item import _duplicate_item
|
||||
from cms.djangoapps.contentstore.views.preview import _load_preview_module
|
||||
from cms.djangoapps.contentstore.views.tests.test_library import LIBRARY_REST_URL
|
||||
from cms.djangoapps.course_creators.views import add_user_with_status_granted
|
||||
from student import auth
|
||||
from student.auth import has_studio_read_access, has_studio_write_access
|
||||
from student.roles import (
|
||||
from common.djangoapps.student import auth
|
||||
from common.djangoapps.student.auth import has_studio_read_access, has_studio_write_access
|
||||
from common.djangoapps.student.roles import (
|
||||
CourseInstructorRole,
|
||||
CourseStaffRole,
|
||||
LibraryUserRole,
|
||||
@@ -26,8 +26,8 @@ from student.roles import (
|
||||
OrgLibraryUserRole,
|
||||
OrgStaffRole
|
||||
)
|
||||
from student.tests.factories import UserFactory
|
||||
from xblock_django.user_service import DjangoXBlockUserService
|
||||
from common.djangoapps.student.tests.factories import UserFactory
|
||||
from common.djangoapps.xblock_django.user_service import DjangoXBlockUserService
|
||||
from xmodule.modulestore import ModuleStoreEnum
|
||||
from xmodule.modulestore.django import modulestore
|
||||
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
|
||||
|
||||
@@ -11,7 +11,7 @@ from opaque_keys.edx.locator import BlockUsageLocator
|
||||
|
||||
from cms.djangoapps.contentstore.tests.utils import CourseTestCase
|
||||
from cms.djangoapps.contentstore.utils import reverse_course_url
|
||||
from student.models import CourseEnrollment
|
||||
from common.djangoapps.student.models import CourseEnrollment
|
||||
from xmodule.modulestore import ModuleStoreEnum
|
||||
from xmodule.modulestore.search import path_to_location
|
||||
from xmodule.modulestore.tests.factories import CourseFactory, check_mongo_calls_range
|
||||
|
||||
@@ -10,8 +10,8 @@ from six.moves import range
|
||||
|
||||
from cms.djangoapps.contentstore.tests.utils import AjaxEnabledTestClient
|
||||
from cms.djangoapps.contentstore.utils import reverse_course_url, reverse_url
|
||||
from student import auth
|
||||
from student.roles import CourseInstructorRole, CourseStaffRole, OrgInstructorRole, OrgStaffRole
|
||||
from common.djangoapps.student import auth
|
||||
from common.djangoapps.student.roles import CourseInstructorRole, CourseStaffRole, OrgInstructorRole, OrgStaffRole
|
||||
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
|
||||
|
||||
|
||||
|
||||
@@ -6,8 +6,8 @@ import six
|
||||
from mock import Mock, patch
|
||||
|
||||
from cms.djangoapps.contentstore.signals.handlers import GRADING_POLICY_COUNTDOWN_SECONDS, handle_grading_policy_changed
|
||||
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
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ from user_tasks.models import UserTaskArtifact, UserTaskStatus
|
||||
from cms.djangoapps.contentstore.tasks import export_olx, rerun_course
|
||||
from cms.djangoapps.contentstore.tests.test_libraries import LibraryTestCase
|
||||
from cms.djangoapps.contentstore.tests.utils import CourseTestCase
|
||||
from course_action_state.models import CourseRerunState
|
||||
from common.djangoapps.course_action_state.models import CourseRerunState
|
||||
from openedx.core.djangoapps.embargo.models import Country, CountryAccessRule, RestrictedCourse
|
||||
from xmodule.modulestore.django import modulestore
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ from mock import Mock, patch
|
||||
from six import text_type
|
||||
|
||||
from cms.djangoapps.contentstore.tests.utils import mock_requests_get
|
||||
from student.tests.factories import UserFactory
|
||||
from common.djangoapps.student.tests.factories import UserFactory
|
||||
from xmodule.contentstore.content import StaticContent
|
||||
from xmodule.contentstore.django import contentstore
|
||||
from xmodule.exceptions import NotFoundError
|
||||
|
||||
@@ -7,7 +7,7 @@ after deleting it creates same course again
|
||||
from cms.djangoapps.contentstore.tests.utils import AjaxEnabledTestClient
|
||||
from cms.djangoapps.contentstore.utils import delete_course, reverse_url
|
||||
from lms.djangoapps.courseware.tests.factories import UserFactory
|
||||
from student.models import CourseEnrollment
|
||||
from common.djangoapps.student.models import CourseEnrollment
|
||||
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
|
||||
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ from mock import Mock
|
||||
from opaque_keys.edx.keys import AssetKey, CourseKey
|
||||
|
||||
from cms.djangoapps.contentstore.utils import reverse_url
|
||||
from student.models import Registration
|
||||
from common.djangoapps.student.models import Registration
|
||||
from xmodule.contentstore.django import contentstore
|
||||
from xmodule.modulestore import ModuleStoreEnum
|
||||
from xmodule.modulestore.inheritance import own_metadata
|
||||
|
||||
Reference in New Issue
Block a user