diff --git a/cms/envs/common.py b/cms/envs/common.py index fe9db87705..b981b56623 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -658,7 +658,7 @@ MIDDLEWARE = [ # A newer and safer request cache. 'edx_django_utils.cache.middleware.RequestCacheMiddleware', - 'edx_django_utils.monitoring.middleware.MonitoringMemoryMiddleware', + 'edx_django_utils.monitoring.MonitoringMemoryMiddleware', # Cookie monitoring 'openedx.core.lib.request_utils.CookieMonitoringMiddleware', diff --git a/lms/djangoapps/verify_student/management/commands/tests/test_populate_expiration_date.py b/lms/djangoapps/verify_student/management/commands/tests/test_populate_expiration_date.py index 39ce50b4d8..e1f18a4e64 100644 --- a/lms/djangoapps/verify_student/management/commands/tests/test_populate_expiration_date.py +++ b/lms/djangoapps/verify_student/management/commands/tests/test_populate_expiration_date.py @@ -15,7 +15,7 @@ from testfixtures import LogCapture from common.test.utils import MockS3BotoMixin from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification from lms.djangoapps.verify_student.tests.test_models import FAKE_SETTINGS, mock_software_secure_post -from student.tests.factories import UserFactory +from common.djangoapps.student.tests.factories import UserFactory LOGGER_NAME = 'lms.djangoapps.verify_student.management.commands.populate_expiration_date' diff --git a/lms/envs/common.py b/lms/envs/common.py index 9d3cd0da9a..f278013411 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -1678,10 +1678,10 @@ MIDDLEWARE = [ # A newer and safer request cache. 'edx_django_utils.cache.middleware.RequestCacheMiddleware', - 'edx_django_utils.monitoring.middleware.CachedCustomMonitoringMiddleware', + 'edx_django_utils.monitoring.CachedCustomMonitoringMiddleware', # Generate code ownership attributes. Keep this immediately after RequestCacheMiddleware. - 'edx_django_utils.monitoring.code_owner.middleware.CodeOwnerMonitoringMiddleware', + 'edx_django_utils.monitoring.CodeOwnerMonitoringMiddleware', # Cookie monitoring 'openedx.core.lib.request_utils.CookieMonitoringMiddleware', diff --git a/openedx/core/djangoapps/content/learning_sequences/api/processors/content_gating.py b/openedx/core/djangoapps/content/learning_sequences/api/processors/content_gating.py index 534ab922aa..e327856230 100644 --- a/openedx/core/djangoapps/content/learning_sequences/api/processors/content_gating.py +++ b/openedx/core/djangoapps/content/learning_sequences/api/processors/content_gating.py @@ -3,8 +3,8 @@ from datetime import datetime from django.contrib.auth import get_user_model from opaque_keys.edx.keys import CourseKey -from student.models import EntranceExamConfiguration -from util import milestones_helpers +from common.djangoapps.student.models import EntranceExamConfiguration +from common.djangoapps.util import milestones_helpers from .base import OutlineProcessor diff --git a/openedx/core/djangoapps/content/learning_sequences/api/processors/milestones.py b/openedx/core/djangoapps/content/learning_sequences/api/processors/milestones.py index 5a92a7760d..d99398a102 100644 --- a/openedx/core/djangoapps/content/learning_sequences/api/processors/milestones.py +++ b/openedx/core/djangoapps/content/learning_sequences/api/processors/milestones.py @@ -2,7 +2,7 @@ import logging from django.contrib.auth import get_user_model from opaque_keys.edx.keys import CourseKey -from util import milestones_helpers +from common.djangoapps.util import milestones_helpers from .base import OutlineProcessor diff --git a/openedx/core/djangoapps/user_authn/cookies.py b/openedx/core/djangoapps/user_authn/cookies.py index b722fb8207..79141b6a86 100644 --- a/openedx/core/djangoapps/user_authn/cookies.py +++ b/openedx/core/djangoapps/user_authn/cookies.py @@ -22,8 +22,7 @@ from openedx.core.djangoapps.oauth_dispatch.api import create_dot_access_token from openedx.core.djangoapps.oauth_dispatch.jwt import create_jwt_from_token from openedx.core.djangoapps.user_api.accounts.utils import retrieve_last_sitewide_block_completed from openedx.core.djangoapps.user_authn.exceptions import AuthFailedError -from student.models import CourseEnrollment -from util.json_request import JsonResponse +from common.djangoapps.util.json_request import JsonResponse log = logging.getLogger(__name__)