Skip to content
Snippets Groups Projects
Commit b53058b6 authored by Jiří Helebrant's avatar Jiří Helebrant
Browse files

Update URL config for compatibility with Django 2.0+

parent d27d5c16
1 merge request!9merge current dev branch into master
from django.conf.urls import url from django.conf.urls import url
from django.urls import path
from rest_framework import routers from rest_framework import routers
from . import views from . import views
...@@ -9,7 +10,7 @@ router.register(r"connection", views.ConnectionTestResultList) ...@@ -9,7 +10,7 @@ router.register(r"connection", views.ConnectionTestResultList)
router.register(r"website", views.WebsiteTestResultList) router.register(r"website", views.WebsiteTestResultList)
urlpatterns = router.urls + [ urlpatterns = router.urls + [
url(r"speed_diff/?", views.calculate_speed_diff), path(r"speed_diff/?", views.calculate_speed_diff),
url(r"website_status/?", views.website_status), path(r"website_status/?", views.website_status),
url(r"ripe_ip_info/?", views.ripe_ip_info), path(r"ripe_ip_info/?", views.ripe_ip_info),
] ]
Django==1.11.4 Django==2.0.2
django-ipware==1.1.6 django-ipware==1.1.6
django-webpack-loader==0.4.1 django-webpack-loader==0.5.0
djangorestframework==3.6.2 djangorestframework==3.7.3
dnspython==1.15.0 dnspython==1.15.0
gunicorn==19.7.1 gunicorn==19.7.1
raven==6.0.0 raven==6.3.0
requests==2.13.0 requests==2.18.4
tld==0.7.8 tld==0.7.9
...@@ -3,7 +3,7 @@ from django.contrib import admin ...@@ -3,7 +3,7 @@ from django.contrib import admin
from django.views.generic import TemplateView from django.views.generic import TemplateView
urlpatterns = [ urlpatterns = [
url(r"^admin/", include(admin.site.urls)), url(r'^admin/', admin.site.urls),
url(r"^$", TemplateView.as_view(template_name="index.html")), url(r"^$", TemplateView.as_view(template_name="index.html")),
url(r"netmetr_test/?", TemplateView.as_view(template_name="test.html")), url(r"netmetr_test/?", TemplateView.as_view(template_name="test.html")),
url(r"^api/", include("api.urls")), url(r"^api/", include("api.urls")),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment