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:
@@ -11,7 +11,7 @@ from django.test import TestCase
|
||||
|
||||
from openedx.core.djangoapps.api_admin.tests import factories
|
||||
from openedx.core.djangolib.testing.utils import skip_unless_lms
|
||||
from student.tests.factories import UserFactory
|
||||
from common.djangoapps.student.tests.factories import UserFactory
|
||||
|
||||
|
||||
@skip_unless_lms
|
||||
|
||||
@@ -10,7 +10,7 @@ from mock import patch
|
||||
|
||||
from openedx.core.djangoapps.api_admin.management.commands import create_api_access_request
|
||||
from openedx.core.djangoapps.api_admin.models import ApiAccessConfig, ApiAccessRequest
|
||||
from student.tests.factories import UserFactory
|
||||
from common.djangoapps.student.tests.factories import UserFactory
|
||||
|
||||
|
||||
@unittest.skipUnless(settings.ROOT_URLCONF == 'lms.urls', 'Tests only valid in lms')
|
||||
|
||||
@@ -20,7 +20,7 @@ from django.utils.encoding import python_2_unicode_compatible
|
||||
from model_utils.models import TimeStampedModel
|
||||
from six.moves.urllib.parse import urlunsplit # pylint: disable=import-error
|
||||
|
||||
from edxmako.shortcuts import render_to_string
|
||||
from common.djangoapps.edxmako.shortcuts import render_to_string
|
||||
from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
@@ -8,7 +8,7 @@ from oauth2_provider.models import get_application_model
|
||||
|
||||
from openedx.core.djangoapps.site_configuration.tests.factories import SiteFactory
|
||||
from openedx.core.djangoapps.api_admin.models import ApiAccessRequest, Catalog
|
||||
from student.tests.factories import UserFactory
|
||||
from common.djangoapps.student.tests.factories import UserFactory
|
||||
|
||||
Application = get_application_model() # pylint: disable=invalid-name
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ from openedx.core.djangoapps.api_admin.models import log as model_log
|
||||
from openedx.core.djangoapps.api_admin.tests.factories import ApiAccessRequestFactory
|
||||
from openedx.core.djangoapps.site_configuration.tests.factories import SiteFactory
|
||||
from openedx.core.djangolib.testing.utils import skip_unless_lms
|
||||
from student.tests.factories import UserFactory
|
||||
from common.djangoapps.student.tests.factories import UserFactory
|
||||
|
||||
|
||||
@ddt.ddt
|
||||
|
||||
@@ -19,7 +19,7 @@ from openedx.core.djangoapps.api_admin.tests.factories import (
|
||||
)
|
||||
from openedx.core.djangoapps.api_admin.tests.utils import VALID_DATA
|
||||
from openedx.core.djangolib.testing.utils import skip_unless_lms
|
||||
from student.tests.factories import UserFactory
|
||||
from common.djangoapps.student.tests.factories import UserFactory
|
||||
|
||||
Application = get_application_model() # pylint: disable=invalid-name
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ from oauth2_provider.models import get_application_model
|
||||
from oauth2_provider.views import ApplicationRegistration
|
||||
from slumber.exceptions import HttpNotFoundError
|
||||
|
||||
from edxmako.shortcuts import render_to_response
|
||||
from common.djangoapps.edxmako.shortcuts import render_to_response
|
||||
from openedx.core.djangoapps.api_admin.decorators import require_api_access
|
||||
from openedx.core.djangoapps.api_admin.forms import ApiAccessRequestForm, CatalogForm
|
||||
from openedx.core.djangoapps.api_admin.models import ApiAccessRequest, Catalog
|
||||
|
||||
Reference in New Issue
Block a user