From b85ae48b0ba7a95aeba223beb788fe1b4744006b Mon Sep 17 00:00:00 2001 From: Tony Narlock Date: Thu, 7 Dec 2017 10:31:32 -0600 Subject: [PATCH] fix URL imports for 2.0 see also: #79, #81 --- robots/views.py | 7 ++++++- tests/test_utils/urls.py | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/robots/views.py b/robots/views.py index b17fe98..3a7f6f9 100644 --- a/robots/views.py +++ b/robots/views.py @@ -1,12 +1,17 @@ +import django from django.contrib.sitemaps import views as sitemap_views from django.contrib.sites.models import Site -from django.core.urlresolvers import NoReverseMatch, reverse from django.views.decorators.cache import cache_page from django.views.generic import ListView from robots import settings from robots.models import Rule +if django.VERSION[:2] >= (2, 0): + from django.urls import NoReverseMatch, reverse +else: + from django.core.urlresolvers import NoReverseMatch, reverse + class RuleList(ListView): """ diff --git a/tests/test_utils/urls.py b/tests/test_utils/urls.py index 31c076c..a001979 100644 --- a/tests/test_utils/urls.py +++ b/tests/test_utils/urls.py @@ -1,15 +1,21 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import, print_function, unicode_literals +import django + import django.contrib.sitemaps.views import django.views.i18n import django.views.static from django.conf import settings -from django.conf.urls import include, url from django.contrib import admin from django.contrib.sitemaps.views import sitemap as sitemap_view from django.views.decorators.cache import cache_page +if django.VERSION[:2] >= (2, 0): + from django.urls import include, re_path as url +else: + from django.conf.urls import include, url + urlpatterns = [ url(r'^media/(?P.*)$', django.views.static.serve, # NOQA {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),