Merge pull request #18313 from edx/hack_xix/PLAT-1397

s/django.core.urlresolvers/django.urls/g

cms/djangoapps/api/v1/tests/test_views/test_course_runs.py

@@ -3,7 +3,7 @@ import datetime
 import ddt
 import pytz
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import RequestFactory
 from opaque_keys.edx.keys import CourseKey
 from openedx.core.lib.courses import course_image_url

cms/djangoapps/cms_user_tasks/signals.py

@@ -5,7 +5,7 @@ from __future__ import absolute_import, print_function, unicode_literals
 
 import logging
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.dispatch import receiver
 from user_tasks.models import UserTaskArtifact
 from user_tasks.signals import user_task_stopped

cms/djangoapps/cms_user_tasks/tests.py

@@ -12,7 +12,7 @@ from boto.exception import NoAuthHandlerFound
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.core import mail
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import override_settings
 from rest_framework.test import APITestCase
 from user_tasks.models import UserTaskArtifact, UserTaskStatus

cms/djangoapps/contentstore/api/tests/test_views.py

@@ -8,7 +8,7 @@ import tempfile
 from datetime import datetime
 from urllib import urlencode
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from path import Path as path
 from mock import patch
 from rest_framework import status

cms/djangoapps/contentstore/courseware_index.py

@@ -7,7 +7,7 @@ from abc import ABCMeta, abstractmethod
 from datetime import timedelta
 
 from django.conf import settings
-from django.core.urlresolvers import resolve
+from django.urls import resolve
 from django.utils.translation import ugettext as _
 from django.utils.translation import ugettext_lazy
 from search.search_engine_base import SearchEngine

cms/djangoapps/contentstore/tests/test_course_create_rerun.py

@@ -4,7 +4,7 @@ Test view handler for rerun (and eventually create)
 from datetime import datetime
 
 import ddt
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test.client import RequestFactory
 from mock import patch
 from opaque_keys.edx.keys import CourseKey

cms/djangoapps/contentstore/tests/test_request_event.py

@@ -1,6 +1,6 @@
 """Tests for CMS's requests to logs"""
 import mock
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 
 from contentstore.views.helpers import event as cms_user_track

cms/djangoapps/contentstore/tests/tests.py

@@ -11,7 +11,7 @@ from ddt import data, ddt, unpack
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.cache import cache
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 from django.test.utils import override_settings
 from freezegun import freeze_time

cms/djangoapps/contentstore/utils.py

@@ -6,7 +6,7 @@ import logging
 from datetime import datetime
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext as _
 from opaque_keys.edx.keys import CourseKey, UsageKey
 from pytz import UTC

cms/djangoapps/contentstore/views/course.py

@@ -14,7 +14,7 @@ from ccx_keys.locator import CCXLocator
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.core.exceptions import PermissionDenied, ValidationError
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import Http404, HttpResponse, HttpResponseBadRequest, HttpResponseNotFound
 from django.shortcuts import redirect
 from django.utils.translation import ugettext as _

cms/djangoapps/contentstore/views/preview.py

@@ -5,7 +5,7 @@ from functools import partial
 
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import Http404, HttpResponseBadRequest
 from django.utils.translation import ugettext as _
 from opaque_keys.edx.keys import UsageKey

cms/djangoapps/contentstore/views/public.py

@@ -3,7 +3,7 @@ Public views
 """
 from django.conf import settings
 from django.template.context_processors import csrf
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.shortcuts import redirect
 from django.views.decorators.clickjacking import xframe_options_deny
 from django.views.decorators.csrf import ensure_csrf_cookie

cms/djangoapps/contentstore/views/tests/test_item.py

@@ -4,7 +4,7 @@ from datetime import datetime, timedelta
 
 import ddt
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import Http404
 from django.test import TestCase
 from django.test.client import RequestFactory

cms/djangoapps/contentstore/views/tests/test_organizations.py

@@ -1,7 +1,7 @@
 """Tests covering the Organizations listing on the Studio home."""
 import json
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 from mock import patch
 

cms/djangoapps/contentstore/views/tests/test_transcript_settings.py

@@ -5,7 +5,7 @@ from io import BytesIO
 from mock import Mock, patch, ANY
 
 from django.test.testcases import TestCase
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from edxval import api
 
 from contentstore.tests.utils import CourseTestCase

cms/djangoapps/contentstore/views/tests/test_transcripts.py

@@ -10,7 +10,7 @@ import textwrap
 from uuid import uuid4
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test.utils import override_settings
 from edxval.api import create_video
 from opaque_keys.edx.keys import UsageKey

cms/djangoapps/contentstore/views/videos.py

@@ -15,7 +15,7 @@ from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.contrib.staticfiles.storage import staticfiles_storage
 from django.core.files.images import get_image_dimensions
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import HttpResponse, HttpResponseNotFound
 from django.utils.translation import ugettext as _
 from django.utils.translation import ugettext_noop

cms/djangoapps/course_creators/tests/test_views.py

@@ -5,7 +5,7 @@ Tests course_creators.views.py.
 import mock
 from django.contrib.auth.models import User
 from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 
 from course_creators.views import (

cms/djangoapps/maintenance/tests.py

@@ -5,7 +5,7 @@ import json
 
 import ddt
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from contentstore.management.commands.utils import get_course_versions
 from student.tests.factories import AdminFactory, UserFactory

cms/lib/xblock/runtime.py

@@ -2,7 +2,7 @@
 XBlock runtime implementations for edX Studio
 """
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 
 def handler_url(block, handler_name, suffix='', query='', thirdparty=False):

cms/templates/accessibility.html

@@ -2,7 +2,7 @@
 <%inherit file="base.html" />
 <%def name="online_help_token()"><% return "accessibility" %></%def>
 <%!
-  from django.core.urlresolvers import reverse
+  from django.urls import reverse
   from django.utils.translation import ugettext as _
   from openedx.core.djangolib.markup import HTML, Text
   from openedx.core.djangolib.js_utils import js_escaped_string, dump_js_escaped_json

cms/templates/asset_index.html

@@ -2,7 +2,7 @@
 <%inherit file="base.html" />
 <%def name="online_help_token()"><% return "files" %></%def>
 <%!
-  from django.core.urlresolvers import reverse
+  from django.urls import reverse
   from django.utils.translation import ugettext as _
   from openedx.core.djangolib.markup import HTML, Text
   from openedx.core.djangolib.js_utils import js_escaped_string, dump_js_escaped_json

cms/templates/course-create-rerun.html

@@ -3,7 +3,7 @@
 <%def name="online_help_token()"><% return "course_rerun" %></%def>
 <%!
 from django.utils.translation import ugettext as _
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from openedx.core.djangolib.js_utils import js_escaped_string
 %>
 

cms/templates/edit-tabs.html

@@ -4,7 +4,7 @@
 <%namespace name='static' file='static_content.html'/>
 <%!
   from django.utils.translation import ugettext as _
-  from django.core.urlresolvers import reverse
+  from django.urls import reverse
   from xmodule.tabs import StaticTab
   from openedx.core.djangolib.js_utils import js_escaped_string
 %>

cms/templates/error.html

@@ -2,7 +2,7 @@
 <%inherit file="base.html" />
 <%!
 from django.utils.translation import ugettext as _
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.conf import settings
 %>
 <%block name="bodyclass">error</%block>

cms/templates/export_git.html

@@ -3,7 +3,7 @@
 <%namespace name='static' file='static_content.html'/>
 
 <%!
-  from django.core.urlresolvers import reverse
+  from django.urls import reverse
   from django.utils.translation import ugettext as _
 %>
 <%block name="title">${_("Export Course to Git")}</%block>

cms/templates/howitworks.html

@@ -3,7 +3,7 @@
 <%def name="online_help_token()"><% return "welcome" %></%def>
 <%namespace name='static' file='static_content.html'/>
 <%!
-  from django.core.urlresolvers import reverse
+  from django.urls import reverse
   from django.utils.translation import ugettext as _
   from openedx.core.djangolib.markup import HTML, Text
 %>

cms/templates/html_error.html

@@ -1,5 +1,5 @@
 <%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
+<%! from django.urls import reverse %>
 
 <%block name="content">
   <div class="wrapper wrapper-alert wrapper-alert-error is-shown">

cms/templates/login.html

@@ -3,7 +3,7 @@
 <%inherit file="base.html" />
 <%def name="online_help_token()"><% return "login" %></%def>
 <%!
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext as _
 from openedx.core.djangolib.js_utils import js_escaped_string
 %>

cms/templates/maintenance/base.html

@@ -3,7 +3,7 @@
 <%def name='online_help_token()'><% return 'maintenance' %></%def>
 <%namespace name='static' file='../static_content.html'/>
 <%!
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext as _
 %>
 <%block name="content">

cms/templates/maintenance/container.html

@@ -2,7 +2,7 @@
 <%inherit file="base.html" />
 <%namespace name='static' file='../static_content.html'/>
 <%!
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from openedx.core.djangolib.js_utils import js_escaped_string
 %>
 <%block name="title">${view['name']}</%block>

cms/templates/maintenance/index.html

@@ -3,7 +3,7 @@
 <%namespace name='static' file='../static_content.html'/>
 <%!
 from django.utils.translation import ugettext as _
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 %>
 <%block name="title">${_('Maintenance Dashboard')}</%block>
 <%block name="viewcontent">

cms/templates/manage_users.html

@@ -1,7 +1,7 @@
 <%inherit file="base.html" />
 <%!
 from django.utils.translation import ugettext as _
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from openedx.core.djangolib.js_utils import (
     dump_js_escaped_json, js_escaped_string

cms/templates/manage_users_lib.html

@@ -1,7 +1,7 @@
 <%inherit file="base.html" />
 <%!
 from django.utils.translation import ugettext as _
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from openedx.core.djangolib.js_utils import (
     dump_js_escaped_json, js_escaped_string

cms/templates/register.html

@@ -2,7 +2,7 @@
 <%def name="online_help_token()"><% return "register" %></%def>
 <%!
 from django.utils.translation import ugettext as _
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 %>
 
 <%block name="title">${_("Sign Up")}</%block>

cms/templates/registration/activation_complete.html

@@ -1,7 +1,7 @@
 <%inherit file="../base.html" />
 <%!
 from django.utils.translation import ugettext as _
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 %>
 
 <%namespace name='static' file='../static_content.html'/>

cms/templates/registration/activation_invalid.html

@@ -3,7 +3,7 @@
 <%namespace name='static' file='../static_content.html'/>
 <%!
 from django.utils.translation import ugettext as _
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from openedx.core.djangolib.markup import HTML, Text
 %>
 

cms/templates/widgets/footer.html

@@ -1,6 +1,6 @@
 <%!
 from django.utils.translation import ugettext as _
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from datetime import datetime
 from django.conf import settings
 import pytz

cms/templates/widgets/header.html

@@ -2,7 +2,7 @@
 <%namespace name='static' file='../static_content.html'/>
 <%!
   from django.conf import settings
-  from django.core.urlresolvers import reverse
+  from django.urls import reverse
   from django.utils.translation import ugettext as _
   from openedx.core.djangoapps.lang_pref.api import header_language_selector_is_enabled, released_languages
 %>

cms/templates/widgets/user_dropdown.html

@@ -2,7 +2,7 @@
 <%namespace name='static' file='../static_content.html'/>
 <%!
   from django.conf import settings
-  from django.core.urlresolvers import reverse
+  from django.urls import reverse
   from django.utils.translation import ugettext as _
   from student.roles import GlobalStaff
 %>
@@ -57,4 +57,4 @@
       </ul>
     </div>
   </div>
-% endif
+% endif

common/djangoapps/course_modes/tests/test_admin.py

@@ -6,7 +6,7 @@ from datetime import datetime, timedelta
 
 import ddt
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from pytz import UTC, timezone
 
 from course_modes.admin import CourseModeForm

common/djangoapps/course_modes/tests/test_views.py

@@ -11,7 +11,7 @@ import freezegun
 import httpretty
 import pytz
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from mock import patch
 from nose.plugins.attrib import attr
 

common/djangoapps/course_modes/views.py

@@ -9,7 +9,7 @@ import urllib
 import waffle
 from babel.dates import format_datetime
 from django.contrib.auth.decorators import login_required
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import transaction
 from django.http import HttpResponse, HttpResponseBadRequest
 from django.shortcuts import redirect

common/djangoapps/edxmako/shortcuts.py

@@ -16,7 +16,7 @@ import logging
 from urlparse import urljoin
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import HttpResponse
 from django.template import engines
 

common/djangoapps/edxmako/tests.py

@@ -2,7 +2,7 @@ import unittest
 
 import ddt
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import HttpResponse
 from django.test import TestCase
 from django.test.client import RequestFactory

common/djangoapps/enrollment/tests/test_views.py

@@ -13,7 +13,7 @@ from django.conf import settings
 from django.core.cache import cache
 from django.core.exceptions import ImproperlyConfigured
 from django.core.handlers.wsgi import WSGIRequest
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import Client
 from django.test.utils import override_settings
 from mock import patch

common/djangoapps/entitlements/api/v1/tests/test_views.py

@@ -8,7 +8,7 @@ from courseware.models import (
     DynamicUpgradeDeadlineConfiguration
 )
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.timezone import now
 from mock import patch
 from opaque_keys.edx.locator import CourseKey

common/djangoapps/microsite_configuration/tests/backends/test_filebased.py

@@ -6,7 +6,7 @@ from mock import patch
 
 from django.test import TestCase
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from microsite_configuration.backends.base import (
     BaseMicrositeBackend,

common/djangoapps/student/cookies.py

@@ -9,7 +9,7 @@ import time
 import six
 from django.conf import settings
 from django.contrib.auth.models import User
-from django.core.urlresolvers import NoReverseMatch, reverse
+from django.urls import NoReverseMatch, reverse
 from django.dispatch import Signal
 from django.utils.http import cookie_date
 

common/djangoapps/student/forms.py

@@ -12,7 +12,7 @@ from django.contrib.auth.models import User
 from django.contrib.auth.tokens import default_token_generator
 from django.contrib.sites.models import Site
 from django.core.exceptions import ValidationError
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.validators import RegexValidator, slug_re
 from django.forms import widgets
 from django.utils.http import int_to_base36

common/djangoapps/student/helpers.py

@@ -11,7 +11,7 @@ from datetime import datetime
 import django
 from django.conf import settings
 from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import NoReverseMatch, reverse
+from django.urls import NoReverseMatch, reverse
 from django.core.validators import ValidationError
 from django.contrib.auth import load_backend
 from django.contrib.auth.models import User

common/djangoapps/student/tests/test_activate_account.py

@@ -3,7 +3,7 @@ import unittest
 from uuid import uuid4
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase, override_settings
 from mock import patch
 

common/djangoapps/student/tests/test_admin_views.py

@@ -3,7 +3,7 @@ Tests student admin.py
 """
 from django.contrib.admin.sites import AdminSite
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 from mock import Mock
 

common/djangoapps/student/tests/test_bulk_email_settings.py

@@ -7,7 +7,7 @@ Course Auth is turned on.
 import unittest
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 # This import is for an lms djangoapp.
 # Its testcases are only run under lms.

common/djangoapps/student/tests/test_certificates.py

@@ -6,7 +6,7 @@ import datetime
 import ddt
 import mock
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test.utils import override_settings
 from mock import patch
 from pytz import UTC

common/djangoapps/student/tests/test_configuration_overrides.py

@@ -5,7 +5,7 @@ import json
 
 import mock
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 
 from student.models import UserSignupSource

common/djangoapps/student/tests/test_cookies.py

@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 
 import six
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import RequestFactory
 
 from openedx.core.djangoapps.user_api.accounts.utils import retrieve_last_sitewide_block_completed

common/djangoapps/student/tests/test_create_account.py

@@ -10,7 +10,7 @@ import mock
 import pytz
 from django.conf import settings
 from django.contrib.auth.models import AnonymousUser, User
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase, TransactionTestCase
 from django.test.client import RequestFactory
 from django.test.utils import override_settings

common/djangoapps/student/tests/test_credit.py

@@ -7,7 +7,7 @@ import unittest
 import ddt
 import pytz
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test.utils import override_settings
 from mock import patch
 

common/djangoapps/student/tests/test_email.py

@@ -5,7 +5,7 @@ import unittest
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.core import mail
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import transaction
 from django.http import HttpResponse
 from django.test import override_settings, TransactionTestCase

common/djangoapps/student/tests/test_enrollment.py

@@ -5,7 +5,7 @@ import unittest
 
 import ddt
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from mock import patch
 from nose.plugins.attrib import attr
 

common/djangoapps/student/tests/test_helpers.py

@@ -5,7 +5,7 @@ import logging
 import ddt
 from django.conf import settings
 from django.contrib.sessions.middleware import SessionMiddleware
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 from django.test.client import RequestFactory
 from django.test.utils import override_settings

common/djangoapps/student/tests/test_login.py

@@ -8,7 +8,7 @@ import httpretty
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.cache import cache
-from django.core.urlresolvers import NoReverseMatch, reverse
+from django.urls import NoReverseMatch, reverse
 from django.http import HttpResponse, HttpResponseBadRequest
 from django.test import TestCase
 from django.test.client import Client

common/djangoapps/student/tests/test_login_registration_forms.py

@@ -4,7 +4,7 @@ import urllib
 
 import ddt
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from mock import patch
 
 from third_party_auth.tests.testutil import ThirdPartyAuthTestMixin

common/djangoapps/student/tests/test_long_username_email.py

@@ -2,7 +2,7 @@
 
 import json
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 
 from openedx.core.djangoapps.user_api.accounts import USERNAME_BAD_LENGTH_MSG

common/djangoapps/student/tests/test_password_policy.py

@@ -7,7 +7,7 @@ from importlib import import_module
 
 from django.conf import settings
 from django.contrib.auth.models import AnonymousUser
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 from django.test.client import RequestFactory
 from django.test.utils import override_settings

common/djangoapps/student/tests/test_recent_enrollments.py

@@ -6,7 +6,7 @@ import unittest
 
 import ddt
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.timezone import now
 from nose.plugins.attrib import attr
 from opaque_keys.edx import locator

common/djangoapps/student/tests/test_refunds.py

@@ -11,7 +11,7 @@ import pytz
 # Explicitly import the cache from ConfigurationModel so we can reset it after each test
 from config_models.models import cache
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test.client import Client
 from django.test.utils import override_settings
 from mock import patch

common/djangoapps/student/tests/test_reset_password.py

@@ -12,7 +12,7 @@ from django.contrib.auth.models import User
 from django.contrib.auth.tokens import default_token_generator
 from django.core.cache import cache
 from django.core import mail
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test.client import RequestFactory
 from django.test.utils import override_settings
 from django.utils.http import int_to_base36

common/djangoapps/student/tests/test_retirement.py

@@ -7,7 +7,7 @@ import ddt
 from django.apps import apps
 from django.conf import settings
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 import pytest
 

common/djangoapps/student/tests/test_userstanding.py

@@ -5,7 +5,7 @@ that students with disabled accounts are unable to access the courseware.
 import unittest
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import Client, TestCase
 
 from student.models import UserStanding

common/djangoapps/student/tests/test_verification_status.py

@@ -4,7 +4,7 @@ from datetime import datetime, timedelta
 
 import ddt
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import override_settings
 from mock import patch
 from nose.plugins.attrib import attr

common/djangoapps/student/tests/test_views.py

@@ -10,7 +10,7 @@ from datetime import timedelta
 import ddt
 from completion.test_utils import submit_completions_for_testing, CompletionWaffleTestMixin
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import RequestFactory, TestCase
 from django.test.utils import override_settings
 from django.utils.timezone import now

common/djangoapps/student/tests/tests.py

@@ -12,7 +12,7 @@ import pytz
 from config_models.models import cache
 from django.conf import settings
 from django.contrib.auth.models import AnonymousUser, User
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase, override_settings
 from django.test.client import Client
 from markupsafe import escape

common/djangoapps/student/views/dashboard.py

@@ -11,7 +11,7 @@ from completion.utilities import get_key_to_last_completed_course_block
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.shortcuts import redirect
 from django.utils.translation import ugettext as _
 from django.views.decorators.csrf import ensure_csrf_cookie

common/djangoapps/student/views/login.py

@@ -18,7 +18,7 @@ from django.contrib.auth import authenticate, load_backend, login as django_logi
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import AnonymousUser, User
 from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
-from django.core.urlresolvers import NoReverseMatch, reverse, reverse_lazy
+from django.urls import NoReverseMatch, reverse, reverse_lazy
 from django.core.validators import ValidationError, validate_email
 from django.http import Http404, HttpResponse, HttpResponseBadRequest, HttpResponseForbidden
 from django.shortcuts import redirect

common/djangoapps/student/views/management.py

@@ -20,7 +20,7 @@ from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import AnonymousUser, User
 from django.contrib.auth.views import password_reset_confirm
 from django.core import mail
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.validators import ValidationError, validate_email
 from django.db import transaction
 from django.db.models.signals import post_save

common/djangoapps/third_party_auth/admin.py

@@ -5,7 +5,7 @@ Admin site configuration for third party authentication
 from config_models.admin import KeyedConfigurationModelAdmin
 from django import forms
 from django.contrib import admin
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import DatabaseError, transaction
 from django.utils.translation import ugettext_lazy as _
 

common/djangoapps/third_party_auth/api/tests/test_views.py

@@ -5,7 +5,7 @@ Tests for the Third Party Auth REST API
 import unittest
 
 import ddt
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import QueryDict
 from mock import patch
 from provider.constants import CONFIDENTIAL

common/djangoapps/third_party_auth/decorators.py

@@ -4,7 +4,6 @@ Decorators that can be used to interact with third_party_auth.
 from functools import wraps
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
 from django.shortcuts import redirect
 from django.utils.decorators import available_attrs
 

common/djangoapps/third_party_auth/pipeline.py

@@ -70,7 +70,7 @@ import analytics
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.mail.message import EmailMessage
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import HttpResponseBadRequest
 from django.shortcuts import redirect
 import social_django

common/djangoapps/third_party_auth/tests/specs/base.py

@@ -14,7 +14,7 @@ from django.contrib import auth
 from django.contrib.auth import models as auth_models
 from django.contrib.messages.storage import fallback
 from django.contrib.sessions.backends import cache
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import utils as django_utils
 from django.conf import settings as django_settings
 from social_core import actions, exceptions

common/djangoapps/third_party_auth/tests/specs/test_google.py

@@ -3,7 +3,7 @@ import base64
 import hashlib
 import hmac
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 import json
 from mock import patch
 from openedx.tests.util import expected_redirect_url

common/djangoapps/third_party_auth/tests/specs/test_lti.py

@@ -5,7 +5,7 @@ import unittest
 import django
 from django.conf import settings
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from oauthlib.oauth1.rfc5849 import Client, SIGNATURE_TYPE_BODY
 from openedx.tests.util import expected_redirect_url
 from third_party_auth.tests import testutil

common/djangoapps/third_party_auth/tests/test_admin.py

@@ -5,7 +5,7 @@ import unittest
 
 from django.contrib.admin.sites import AdminSite
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.forms import models
 
 from student.tests.factories import UserFactory

common/djangoapps/third_party_auth/views.py

@@ -2,7 +2,7 @@
 Extra views required for SSO
 """
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import Http404, HttpResponse, HttpResponseNotAllowed, HttpResponseServerError
 from django.shortcuts import redirect, render
 from django.views.decorators.csrf import csrf_exempt

common/djangoapps/track/tests/test_logs.py

@@ -3,7 +3,7 @@ import unittest
 
 import mock
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 
 from track.models import TrackingLog

common/djangoapps/util/testing.py

@@ -6,7 +6,7 @@ import json
 import sys
 
 from django.conf import settings
-from django.core.urlresolvers import clear_url_caches, resolve
+from django.urls import clear_url_caches, resolve
 from django.test import TestCase
 from mock import patch
 

common/djangoapps/util/url.py

@@ -6,7 +6,7 @@ import sys
 from importlib import import_module
 
 from django.conf import settings
-from django.core.urlresolvers import set_urlconf
+from django.urls import set_urlconf
 
 
 def reload_django_url_config():

common/test/test-theme/cms/templates/login.html

@@ -4,7 +4,7 @@
 <%inherit file="base.html" />
 <%def name="online_help_token()"><% return "login" %></%def>
 <%!
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext as _
 from openedx.core.djangolib.js_utils import js_escaped_string
 %>

common/test/test_sites/test_site/templates/courseware/tabs.html

@@ -2,7 +2,7 @@
 <%namespace name='static' file='/static_content.html'/>
 <%!
  from django.utils.translation import ugettext as _
- from django.core.urlresolvers import reverse
+ from django.urls import reverse
  %>
 <%page args="tab_list, active_page, default_tab, tab_image" expression_filter="h" />
 

common/test/test_sites/test_site/templates/emails/confirm_email_change.txt

@@ -1,4 +1,4 @@
-<%! from django.core.urlresolvers import reverse %>
+<%! from django.urls import reverse %>
 <%! from django.conf import settings %>
 <%! from edxmako.shortcuts import render_to_string, marketing_link %>
 

common/test/test_sites/test_site/templates/footer.html

@@ -2,7 +2,7 @@
 <%page expression_filter="h"/>
 <%namespace name='static' file='static_content.html'/>
 <%!
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext as _
 %>
 

common/test/test_sites/test_site/templates/login-sidebar.html

@@ -1,7 +1,7 @@
 <%page expression_filter="h"/>
 <%!
 from django.utils.translation import ugettext as _ 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 %>
 
 <header>
@@ -16,4 +16,4 @@ from django.core.urlresolvers import reverse
   <p>
     Custom text
   </p>
-</div>
+</div>

common/test/test_sites/test_site/templates/register-sidebar.html

@@ -1,7 +1,7 @@
 <%page expression_filter="h"/>
 <%!
 from django.utils.translation import ugettext as _ 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 %>
 <%namespace file='../../main.html' import="login_query"/>
 <%namespace name='static' file='../../static_content.html'/>

common/test/test_sites/test_site/templates/static_templates/about.html

@@ -1,5 +1,5 @@
 <%page expression_filter="h"/>
-<%! from django.core.urlresolvers import reverse %>
+<%! from django.urls import reverse %>
 <%namespace name='static' file='../../../static_content.html'/>
 
 <%inherit file="../../../main.html" />

common/test/test_sites/test_site/templates/static_templates/contact.html

@@ -3,7 +3,7 @@
 <%namespace name='static' file='../static_content.html'/>
 <%!
 from django.utils.translation import ugettext as _
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 %>
 
 <%block name="title"><title>${_("Contact {platform_name}").format(platform_name=settings.PLATFORM_NAME)}</title></%block>

common/test/test_sites/test_site/templates/static_templates/faq.html

@@ -3,7 +3,7 @@
 <%namespace name='static' file='../static_content.html'/>
 <%!
 from django.utils.translation import ugettext as _
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 %>
 
 <%block name="title"><title>${_("FAQ")}</title></%block>

common/test/test_sites/test_site/templates/static_templates/tos.html

@@ -3,7 +3,7 @@
 <%namespace name='static' file='../static_content.html'/>
 <%!
 from django.utils.translation import ugettext as _
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 %>
 
 <%block name="pagetitle">${_("Terms of Service")}</%block>

lms/djangoapps/badges/events/course_complete.py

@@ -4,7 +4,7 @@ Helper functions for the course complete event that was originally included with
 import hashlib
 import logging
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.text import slugify
 from django.utils.translation import ugettext_lazy as _