Change import from django.core.urlresolvers to django.urls for future…

… compatibility

zinnia/admin/category.py

@@ -1,6 +1,6 @@
 """CategoryAdmin for Zinnia"""
 from django.contrib import admin
-from django.core.urlresolvers import NoReverseMatch
+from django.urls import NoReverseMatch
 from django.utils.html import format_html
 from django.utils.translation import ugettext_lazy as _
 

zinnia/admin/entry.py

@@ -3,9 +3,9 @@
 
 from django.contrib import admin
 from django.contrib.sites.models import Site
-from django.core.urlresolvers import NoReverseMatch
-from django.core.urlresolvers import reverse
 from django.db.models import Q
+from django.urls import NoReverseMatch
+from django.urls import reverse
 from django.utils import timezone
 from django.utils.html import conditional_escape
 from django.utils.html import format_html

zinnia/breadcrumbs.py

@@ -3,7 +3,7 @@
 from datetime import datetime
 from functools import wraps
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.dateformat import DateFormat
 from django.utils.timezone import is_aware
 from django.utils.timezone import localtime

zinnia/calendar.py

@@ -4,7 +4,7 @@
 from calendar import HTMLCalendar
 from datetime import date
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.dates import MONTHS
 from django.utils.dates import WEEKDAYS_ABBR
 from django.utils.formats import date_format

zinnia/feeds.py

@@ -12,10 +12,10 @@
 from django.contrib.sites.models import Site
 from django.contrib.syndication.views import Feed
 from django.core.exceptions import ObjectDoesNotExist
-from django.core.urlresolvers import NoReverseMatch
-from django.core.urlresolvers import reverse
 from django.shortcuts import get_object_or_404
 from django.template.defaultfilters import slugify
+from django.urls import NoReverseMatch
+from django.urls import reverse
 from django.utils.encoding import smart_text
 from django.utils.feedgenerator import Atom1Feed
 from django.utils.translation import ugettext as _

zinnia/ping.py

@@ -16,7 +16,7 @@
 from bs4 import BeautifulSoup
 
 from django.contrib.sites.models import Site
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from zinnia.flags import PINGBACK
 from zinnia.settings import PROTOCOL

zinnia/sitemaps.py

@@ -1,8 +1,8 @@
 """Sitemaps for Zinnia"""
 from django.contrib.sitemaps import Sitemap
-from django.core.urlresolvers import reverse
 from django.db.models import Count
 from django.db.models import Max
+from django.urls import reverse
 
 from tagging.models import Tag
 from tagging.models import TaggedItem

zinnia/tests/test_admin.py

@@ -5,10 +5,10 @@
 from django.contrib.admin.sites import AdminSite
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
-from django.core.urlresolvers import reverse
 from django.test import RequestFactory
 from django.test import TestCase
 from django.test.utils import override_settings
+from django.urls import reverse
 from django.utils import timezone
 from django.utils.translation import activate
 from django.utils.translation import deactivate

zinnia/tests/test_entry.py

@@ -2,9 +2,9 @@
 from datetime import timedelta
 
 from django.contrib.sites.models import Site
-from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.utils import override_settings
+from django.urls import reverse
 from django.utils import timezone
 from django.utils.translation import activate
 from django.utils.translation import deactivate

zinnia/tests/test_moderator.py

@@ -1,9 +1,9 @@
 """Test cases for Zinnia's moderator"""
 from django.contrib.sites.models import Site
 from django.core import mail
-from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.utils import override_settings
+from django.urls import reverse
 from django.utils import timezone
 
 import django_comments as comments

zinnia/tests/test_templatetags.py

@@ -3,14 +3,14 @@
 
 from django.contrib.sites.models import Site
 from django.core.paginator import Paginator
-from django.core.urlresolvers import reverse
 from django.db.models.signals import post_save
 from django.template import Context
 from django.template import Template
 from django.template import TemplateDoesNotExist
 from django.template import TemplateSyntaxError
 from django.test import TestCase
 from django.test.utils import override_settings
+from django.urls import reverse
 from django.utils import timezone
 
 import django_comments as comments

zinnia/url_shortener/backends/default.py

@@ -2,7 +2,7 @@
 import string
 
 from django.contrib.sites.models import Site
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from zinnia.settings import PROTOCOL
 

zinnia/views/quick_entry.py

@@ -7,9 +7,9 @@
 from django import forms
 from django.contrib.auth.decorators import permission_required
 from django.contrib.sites.models import Site
-from django.core.urlresolvers import reverse
 from django.shortcuts import redirect
 from django.template.defaultfilters import slugify
+from django.urls import reverse
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.utils.encoding import smart_str

zinnia/xmlrpc/metaweblog.py

@@ -11,8 +11,8 @@
 from django.contrib.sites.models import Site
 from django.core.files.base import ContentFile
 from django.core.files.storage import default_storage
-from django.core.urlresolvers import reverse
 from django.template.defaultfilters import slugify
+from django.urls import reverse
 from django.utils import six
 from django.utils import timezone
 from django.utils.translation import gettext as _

zinnia/xmlrpc/pingback.py

@@ -14,8 +14,8 @@
 
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.models import Site
-from django.core.urlresolvers import Resolver404
-from django.core.urlresolvers import resolve
+from django.urls import Resolver404
+from django.urls import resolve
 from django.utils import six
 from django.utils.html import strip_tags
 from django.utils.translation import ugettext as _