Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix imports, remove unused import #25645

Merged
merged 1 commit into from
Nov 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cms/envs/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@

# 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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
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'

Expand Down
4 changes: 2 additions & 2 deletions lms/envs/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -1678,10 +1678,10 @@ def _make_locale_paths(settings): # pylint: disable=missing-function-docstring

# 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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

Expand Down
3 changes: 1 addition & 2 deletions openedx/core/djangoapps/user_authn/cookies.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
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__)
Expand Down