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:
@@ -14,9 +14,9 @@ from mock import patch
|
||||
from rest_framework.authentication import SessionAuthentication
|
||||
from rest_framework.response import Response
|
||||
from rest_framework.views import APIView
|
||||
from student.tests.factories import UserFactory
|
||||
from common.djangoapps.student.tests.factories import UserFactory
|
||||
|
||||
from third_party_auth.api.permissions import TPA_PERMISSIONS
|
||||
from common.djangoapps.third_party_auth.api.permissions import TPA_PERMISSIONS
|
||||
|
||||
IDP_SLUG_TESTSHIB = 'testshib'
|
||||
PROVIDER_ID_TESTSHIB = 'saml-' + IDP_SLUG_TESTSHIB
|
||||
|
||||
@@ -17,13 +17,13 @@ from rest_framework.test import APITestCase
|
||||
from six.moves import range
|
||||
from social_django.models import UserSocialAuth
|
||||
|
||||
from student.tests.factories import UserFactory
|
||||
from third_party_auth.api.permissions import (
|
||||
from common.djangoapps.student.tests.factories import UserFactory
|
||||
from common.djangoapps.third_party_auth.api.permissions import (
|
||||
JwtHasScope,
|
||||
JwtHasTpaProviderFilterForRequestedProvider,
|
||||
JwtRestrictedApplication
|
||||
)
|
||||
from third_party_auth.tests.testutil import ThirdPartyAuthTestMixin
|
||||
from common.djangoapps.third_party_auth.tests.testutil import ThirdPartyAuthTestMixin
|
||||
|
||||
VALID_API_KEY = "i am a key"
|
||||
IDP_SLUG_TESTSHIB = 'testshib'
|
||||
|
||||
@@ -23,10 +23,10 @@ from openedx.core.lib.api.authentication import (
|
||||
BearerAuthenticationAllowInactiveUser
|
||||
)
|
||||
from openedx.core.lib.api.permissions import ApiKeyHeaderPermission
|
||||
from third_party_auth import pipeline
|
||||
from third_party_auth.api import serializers
|
||||
from third_party_auth.api.permissions import TPA_PERMISSIONS
|
||||
from third_party_auth.provider import Registry
|
||||
from common.djangoapps.third_party_auth import pipeline
|
||||
from common.djangoapps.third_party_auth.api import serializers
|
||||
from common.djangoapps.third_party_auth.api.permissions import TPA_PERMISSIONS
|
||||
from common.djangoapps.third_party_auth.provider import Registry
|
||||
from common.djangoapps.third_party_auth.api.utils import filter_user_social_auth_queryset_by_provider
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user