trivial: import reverse from django.urls (#41285)

combo/apps/assets/__init__.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import django.apps
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 

combo/apps/assets/views.py

@@ -22,7 +22,7 @@ from django.conf import settings
 from django.contrib import messages
 from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
 from django.core.files.storage import default_storage
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.urls import reverse, reverse_lazy
 from django.http import Http404, HttpResponse
 from django.shortcuts import get_object_or_404
 from django.shortcuts import redirect

combo/apps/dashboard/views.py

@@ -19,7 +19,7 @@ import json
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db.models import Max, Min
 from django.http import Http404, HttpResponse, HttpResponseRedirect
 from django.utils.encoding import force_text

combo/apps/dataviz/models.py

@@ -17,7 +17,7 @@
 import copy
 import os
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import models
 from django.utils.encoding import force_text
 from django.utils.translation import ugettext_lazy as _, ungettext, gettext

combo/apps/gallery/views.py

@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.urls import reverse, reverse_lazy
 from django.shortcuts import redirect
 from django.views.generic import (TemplateView, RedirectView, DetailView,
         CreateView, UpdateView, ListView, DeleteView, FormView)

combo/apps/lingo/__init__.py

@@ -18,7 +18,7 @@ import datetime
 import logging
 
 import django.apps
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
 

combo/apps/lingo/manager_views.py

@@ -18,8 +18,8 @@ import csv
 import datetime
 from dateutil import parser as date_parser
 
-from django.core.urlresolvers import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse
+from django.urls import reverse_lazy
 from django.db.models import Q, Prefetch
 from django.db.models.expressions import RawSQL
 from django.utils import six

combo/apps/lingo/models.py

@@ -34,7 +34,7 @@ from django.forms import models as model_forms, Select
 from django.utils.translation import ugettext_lazy as _
 from django.utils import timezone, dateparse, six
 from django.core.mail import EmailMultiAlternatives
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.formats import localize

combo/apps/lingo/views.py

@@ -22,7 +22,7 @@ import requests
 
 from django.contrib.auth.models import User
 from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core import signing
 from django.http import HttpResponse, HttpResponseNotFound, HttpResponseRedirect, HttpResponseBadRequest
 from django.http import HttpResponseForbidden, Http404, JsonResponse

combo/apps/maps/__init__.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import django.apps
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 

combo/apps/maps/manager_views.py

@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.urls import reverse, reverse_lazy
 from django.http import Http404
 from django.shortcuts import get_object_or_404
 from django.utils.translation import ugettext_lazy as _

combo/apps/maps/models.py

@@ -24,7 +24,7 @@ from django.utils.encoding import python_2_unicode_compatible
 from django.utils.html import escape
 from django.utils.text import slugify
 from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django import forms
 from django.conf import settings
 

combo/apps/pwa/__init__.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import django.apps
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 

combo/apps/pwa/manager_views.py

@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.db.models import Max
 from django import forms
 from django.http import JsonResponse

combo/apps/search/__init__.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import django.apps
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from .engines import engines

combo/apps/wcs/__init__.py

@@ -18,7 +18,7 @@ import hashlib
 
 import django.apps
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.encoding import force_bytes
 from django.utils.translation import ugettext_lazy as _, pgettext_lazy
 

combo/apps/wcs/views.py

@@ -19,7 +19,7 @@ import re
 from django.contrib import messages
 from django.conf import settings
 from django.core.exceptions import DisallowedRedirect, PermissionDenied
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import JsonResponse, HttpResponseRedirect, HttpResponseBadRequest
 from django.utils.http import urlquote
 from django.utils.six.moves.urllib import parse as urlparse

combo/manager/templatetags/cells.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django import template
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 register = template.Library()
 

combo/manager/views.py

@@ -22,7 +22,7 @@ from operator import attrgetter
 from django.conf import settings
 from django.contrib import messages
 from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.urls import reverse, reverse_lazy
 from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.shortcuts import redirect
 from django.shortcuts import render

combo/monkeypatch.py

@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.forms.utils import flatatt
 from django.template.loader import render_to_string
 from django.utils.encoding import force_text

combo/public/admin.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.contrib import admin
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.shortcuts import redirect
 from django.urls.exceptions import NoReverseMatch
 from django.views.decorators.cache import never_cache

combo/urls_utils.py

@@ -18,7 +18,7 @@
 
 from django.contrib.auth.decorators import user_passes_test
 from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import RegexURLPattern, RegexURLResolver
+from django.urls import RegexURLPattern, RegexURLResolver
 
 class DecoratedURLPattern(RegexURLPattern):
     def resolve(self, *args, **kwargs):

tests/test_assets.py

@@ -2,7 +2,7 @@
 
 import base64
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 import pytest
 

tests/test_calendar.py

@@ -6,7 +6,7 @@ import mock
 
 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.utils.six.moves.urllib import parse as urlparse
 
 from combo.data.models import Page

tests/test_cells.py

@@ -18,7 +18,7 @@ from django.test import override_settings
 from django.test.client import RequestFactory
 from django.test.utils import CaptureQueriesContext
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.encoding import force_text, force_bytes
 from django.utils.timezone import now
 

tests/test_dashboard.py

@@ -9,7 +9,7 @@ from django.apps import apps
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.management import call_command
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.six.moves.urllib import parse as urlparse
 from django.test import override_settings
 

tests/test_gallery_cell.py

@@ -2,7 +2,7 @@
 import os
 import pytest
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from combo.data.models import Page
 from combo.apps.gallery.models import GalleryCell, Image
 

tests/test_lingo_payment.py

@@ -9,7 +9,7 @@ import mock
 
 from django.apps import apps
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.wsgi import get_wsgi_application
 from django.conf import settings
 from django.test import override_settings

tests/test_lingo_remote_regie.py

@@ -10,7 +10,7 @@ from requests.exceptions import ConnectionError
 from django.apps import apps
 from django.test.client import RequestFactory
 from django.test import override_settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.conf import settings
 from django.core.management import call_command
 from django.utils.encoding import force_text

tests/test_manager.py

@@ -7,7 +7,7 @@ import shutil
 import mock
 
 from django.core.files.storage import default_storage
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.conf import settings
 from django.contrib.auth.models import User, Group
 from django.db import connection

tests/test_maps_cells.py

@@ -6,7 +6,7 @@ import pytest
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.contrib.auth.models import Group
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test.client import RequestFactory
 from django.utils.html import escape
 

tests/test_notification.py

@@ -9,7 +9,7 @@ from django.contrib.auth.models import User
 from django.test.client import RequestFactory
 from django.utils.encoding import force_text
 from django.utils.timezone import timedelta, now
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from django.test import Client
 

tests/test_public.py

@@ -9,7 +9,7 @@ import os
 
 from django.conf import settings
 from django.contrib.auth.models import User, Group
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import connection
 from django.utils.http import quote
 from django.utils import six

tests/test_pwa.py

@@ -9,7 +9,7 @@ import pywebpush
 
 from django.conf import settings
 from django.core.files import File
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.template import Context, Template
 from django.test import override_settings
 from django.test.client import RequestFactory

tests/test_search.py

@@ -12,7 +12,7 @@ from django.test import override_settings
 from django.test.client import RequestFactory
 from django.test.utils import CaptureQueriesContext
 from django.core.management import call_command
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from combo.apps.search.engines import engines
 from combo.apps.search.models import SearchCell, IndexedCell

tests/test_wcs.py

@@ -15,7 +15,7 @@ import os
 from django.apps import apps
 from django.conf import settings
 from django.core.cache import cache
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import connection
 from django.test import override_settings
 from django.test.client import RequestFactory