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

Django 1.10 deprecation fix for Hackathon XIX
Addresses PLAT-1397

openedx/core/djangoapps/ace_common/template_context.py

@@ -2,7 +2,7 @@
 Context dictionary for templates that use the ace_common base template.
 """
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from edxmako.shortcuts import marketing_link
 from openedx.core.djangoapps.theming.helpers import get_config_value_from_site_or_settings

openedx/core/djangoapps/api_admin/admin.py

@@ -1,7 +1,7 @@
 """Admin views for API managment."""
 from config_models.admin import ConfigurationModelAdmin
 from django.contrib import admin
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext as _
 
 from openedx.core.djangoapps.api_admin.models import ApiAccessConfig, ApiAccessRequest

openedx/core/djangoapps/api_admin/decorators.py

@@ -1,7 +1,7 @@
 """Decorators for API access management."""
 from functools import wraps
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import HttpResponseNotFound
 from django.shortcuts import redirect
 

openedx/core/djangoapps/api_admin/models.py

@@ -8,7 +8,7 @@ from django.conf import settings
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
 from django.core.mail import send_mail
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import models
 from django.db.models.signals import post_save, pre_save
 from django.dispatch import receiver

openedx/core/djangoapps/api_admin/tests/test_views.py

@@ -5,7 +5,7 @@ import json
 import ddt
 import httpretty
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 from django.test.utils import override_settings
 from oauth2_provider.models import get_application_model

openedx/core/djangoapps/api_admin/views.py

@@ -3,7 +3,7 @@ import logging
 
 from django.conf import settings
 from django.contrib.sites.shortcuts import get_current_site
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.urls import reverse, reverse_lazy
 from django.http.response import JsonResponse
 from django.shortcuts import redirect
 from django.views.generic import View

openedx/core/djangoapps/api_admin/widgets.py

@@ -2,7 +2,7 @@
 
 import django
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.forms.utils import flatatt
 from django.forms.widgets import CheckboxInput
 from django.utils.encoding import force_text

openedx/core/djangoapps/auth_exchange/tests/test_views.py

@@ -11,7 +11,7 @@ import unittest
 
 import ddt
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 import httpretty
 import provider.constants

openedx/core/djangoapps/bookmarks/tests/test_views.py

@@ -7,7 +7,7 @@ import urllib
 import ddt
 import pytest
 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
 from rest_framework.test import APIClient

openedx/core/djangoapps/cache_toolbox/tests/test_middleware.py

@@ -1,6 +1,6 @@
 """Tests for cached authentication middleware."""
 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 patch
 

openedx/core/djangoapps/cors_csrf/tests/test_views.py

@@ -4,7 +4,7 @@ import json
 import unittest
 
 from django.conf import settings
-from django.core.urlresolvers import NoReverseMatch, reverse
+from django.urls import NoReverseMatch, reverse
 from django.test import TestCase
 
 import ddt

openedx/core/djangoapps/course_groups/views.py

@@ -9,7 +9,7 @@ from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
 from django.core.paginator import EmptyPage, Paginator
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import transaction
 from django.http import Http404, HttpResponseBadRequest
 from django.utils.translation import ugettext

openedx/core/djangoapps/credit/email_utils.py

@@ -15,7 +15,7 @@ from django.contrib.auth.models import User
 from django.contrib.staticfiles import finders
 from django.core.cache import cache
 from django.core.mail import EmailMessage, SafeMIMEText
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext as _
 
 from edxmako.shortcuts import render_to_string

openedx/core/djangoapps/credit/tests/test_views.py

@@ -12,7 +12,7 @@ import json
 import ddt
 import pytz
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase, Client
 from django.test.utils import override_settings
 from edx_oauth2_provider.tests.factories import AccessTokenFactory, ClientFactory

openedx/core/djangoapps/embargo/middleware.py

@@ -30,7 +30,7 @@ import re
 
 from django.conf import settings
 from django.core.exceptions import MiddlewareNotUsed
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.shortcuts import redirect
 from ipware.ip import get_ip
 

openedx/core/djangoapps/embargo/models.py

@@ -17,7 +17,7 @@ import logging
 import ipaddr
 from config_models.models import ConfigurationModel
 from django.core.cache import cache
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import models
 from django.db.models.signals import post_delete, post_save
 from django.utils.translation import ugettext as _

openedx/core/djangoapps/embargo/test_utils.py

@@ -3,7 +3,7 @@ import contextlib
 
 import mock
 from django.core.cache import cache
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 import pygeoip
 

openedx/core/djangoapps/embargo/tests/test_middleware.py

@@ -6,7 +6,7 @@ from mock import patch
 from nose.plugins.attrib import attr
 import ddt
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.conf import settings
 from django.core.cache import cache as django_cache
 

openedx/core/djangoapps/embargo/tests/test_views.py

@@ -4,7 +4,7 @@ import ddt
 import mock
 import pygeoip
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.conf import settings
 from mock import patch
 

openedx/core/djangoapps/external_auth/login_and_register.py

@@ -5,7 +5,7 @@ This module contains legacy code originally from `student.views`.
 import re
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.shortcuts import redirect
 from opaque_keys.edx.keys import CourseKey
 from six import text_type

openedx/core/djangoapps/external_auth/tests/test_openid_provider.py

@@ -12,7 +12,7 @@ from django.conf import settings
 from django.test import TestCase, LiveServerTestCase
 from django.core.cache import cache
 from django.test.utils import override_settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test.client import RequestFactory
 from unittest import skipUnless
 

openedx/core/djangoapps/external_auth/tests/test_shib.py

@@ -16,7 +16,7 @@ from django.http import HttpResponseRedirect
 from django.test import TestCase
 from django.test.client import RequestFactory, Client as DjangoTestClient
 from django.test.utils import override_settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.contrib.auth.models import AnonymousUser, User
 from openedx.core.djangoapps.external_auth.models import ExternalAuthMap
 from openedx.core.djangoapps.external_auth.views import (

openedx/core/djangoapps/external_auth/tests/test_ssl.py

@@ -11,7 +11,7 @@ from django.conf import settings
 from django.contrib.auth import SESSION_KEY
 from django.contrib.auth.models import AnonymousUser, User
 from django.contrib.sessions.middleware import SessionMiddleware
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test.client import Client
 from django.test.client import RequestFactory
 from django.test.utils import override_settings

openedx/core/djangoapps/external_auth/views.py

@@ -17,7 +17,7 @@ from django.conf import settings
 from django.contrib.auth import REDIRECT_FIELD_NAME, authenticate, login
 from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.validators import validate_email
 from django.db import transaction
 from django.http import HttpResponse, HttpResponseForbidden, HttpResponseRedirect

openedx/core/djangoapps/heartbeat/tests/test_heartbeat.py

@@ -3,7 +3,7 @@ Test the heartbeat
 """
 import json
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db.utils import DatabaseError
 from django.test.client import Client
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase

openedx/core/djangoapps/lang_pref/tests/test_middleware.py

@@ -8,7 +8,7 @@ import mock
 import ddt
 from django.conf import settings
 from django.test import TestCase
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test.client import RequestFactory
 from django.http import HttpResponse
 from django.contrib.sessions.middleware import SessionMiddleware

openedx/core/djangoapps/lang_pref/tests/test_views.py

@@ -4,7 +4,7 @@ Tests: lang pref views
 import json
 from django.test import TestCase
 from django.test.client import RequestFactory
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from student.tests.factories import UserFactory
 from django.utils.translation import LANGUAGE_SESSION_KEY
 from django.contrib.sessions.middleware import SessionMiddleware

openedx/core/djangoapps/oauth_dispatch/tests/test_client_credentials.py

@@ -5,7 +5,7 @@ import json
 import unittest
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 from edx_oauth2_provider.tests.factories import ClientFactory
 from oauth2_provider.models import Application

openedx/core/djangoapps/oauth_dispatch/tests/test_views.py

@@ -9,7 +9,7 @@ import ddt
 import httpretty
 from Cryptodome.PublicKey import RSA
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import RequestFactory, TestCase, override_settings
 from oauth2_provider import models as dot_models
 

openedx/core/djangoapps/oauth_dispatch/views.py

@@ -10,7 +10,7 @@ import json
 
 from Cryptodome.PublicKey import RSA
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import JsonResponse
 from django.views.generic import View
 from edx_oauth2_provider import views as dop_views  # django-oauth2-provider views

openedx/core/djangoapps/profile_images/tests/test_views.py

@@ -6,7 +6,7 @@ import datetime
 from nose.plugins.attrib import attr
 from pytz import UTC
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import HttpResponse
 
 import ddt

openedx/core/djangoapps/programs/tests/test_utils.py

@@ -10,7 +10,7 @@ import httpretty
 import mock
 import pytest
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 from django.test.utils import override_settings
 from nose.plugins.attrib import attr

openedx/core/djangoapps/programs/utils.py

@@ -11,7 +11,7 @@ from dateutil.parser import parse
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.core.cache import cache
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.functional import cached_property
 from edx_rest_api_client.exceptions import SlumberBaseException
 from opaque_keys.edx.keys import CourseKey

openedx/core/djangoapps/schedules/admin.py

@@ -3,7 +3,7 @@ import functools
 from django.contrib import admin
 from django import forms
 from django.db.models import F
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from openedx.core.djangolib.markup import HTML
 

openedx/core/djangoapps/schedules/resolvers.py

@@ -6,7 +6,7 @@ import attr
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.contrib.staticfiles.templatetags.staticfiles import static
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db.models import F, Q
 
 from edx_ace.recipient_resolver import RecipientResolver

openedx/core/djangoapps/service_status/test.py

@@ -2,7 +2,7 @@
 
 import json
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test.client import Client
 import unittest
 

openedx/core/djangoapps/theming/tests/test_theme_style_overrides.py

@@ -2,7 +2,7 @@
 Tests for comprehensive themes.
 """
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 from django.contrib import staticfiles
 

openedx/core/djangoapps/user_api/accounts/serializers.py

@@ -8,7 +8,7 @@ from rest_framework import serializers
 from django.contrib.auth.models import User
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from six import text_type
 
 from lms.djangoapps.badges.utils import badges_enabled

openedx/core/djangoapps/user_api/accounts/tests/test_views.py

@@ -15,7 +15,7 @@ from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
 from django.core import mail
 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.testcases import TransactionTestCase
 from django.test.utils import override_settings

openedx/core/djangoapps/user_api/api.py

@@ -3,7 +3,7 @@ import crum
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext as _
 from django_countries import countries
 

openedx/core/djangoapps/user_api/preferences/tests/test_views.py

@@ -7,7 +7,7 @@ import ddt
 import json
 from mock import patch
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test.testcases import TransactionTestCase
 from rest_framework.test import APIClient
 from student.tests.factories import UserFactory, TEST_PASSWORD

openedx/core/djangoapps/user_api/tests/test_views.py

@@ -10,7 +10,7 @@ import mock
 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.client import RequestFactory
 from django.test.testcases import TransactionTestCase
 from django.test.utils import override_settings

openedx/core/djangoapps/user_api/validation/tests/test_views.py

@@ -8,7 +8,7 @@ import unittest
 import ddt
 from django.conf import settings
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from six import text_type
 
 from openedx.core.djangoapps.user_api import accounts

openedx/core/djangoapps/user_api/verification_api/tests/test_views.py

@@ -6,7 +6,7 @@ import freezegun
 import json
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 from django.test.utils import override_settings
 

openedx/core/djangoapps/zendesk_proxy/tests/test_v0_views.py

@@ -3,7 +3,7 @@ import json
 from copy import deepcopy
 
 import ddt
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test.utils import override_settings
 from mock import MagicMock, patch
 

openedx/core/djangoapps/zendesk_proxy/tests/test_v1_views.py

@@ -3,7 +3,7 @@ import json
 from copy import deepcopy
 
 import ddt
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test.utils import override_settings
 from mock import MagicMock, patch
 

openedx/core/lib/gating/api.py

@@ -5,7 +5,7 @@ import json
 import logging
 
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext as _
 
 from completion.models import BlockCompletion

openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion/__init__.py

@@ -6,7 +6,7 @@ import logging
 import urllib
 
 from django.contrib.staticfiles.storage import staticfiles_storage
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import get_language_bidi
 from xblock.completable import XBlockCompletionMode
 from xblock.core import XBlock

openedx/core/lib/xblock_utils/__init__.py

@@ -14,7 +14,7 @@ from contracts import contract
 
 from django.conf import settings
 from django.contrib.staticfiles.storage import staticfiles_storage
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from pytz import UTC
 from django.utils.html import escape
 from django.contrib.auth.models import User