Skip to content

Commit

Permalink
fix URL imports for 2.0
Browse files Browse the repository at this point in the history
see also: #79, #81
  • Loading branch information
tony committed Dec 7, 2017
1 parent 6a5baf7 commit b85ae48
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
7 changes: 6 additions & 1 deletion robots/views.py
Original file line number Diff line number Diff line change
@@ -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):
"""
Expand Down
8 changes: 7 additions & 1 deletion tests/test_utils/urls.py
Original file line number Diff line number Diff line change
@@ -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<path>.*)$', django.views.static.serve, # NOQA
{'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
Expand Down

0 comments on commit b85ae48

Please sign in to comment.