migrate to django.urls.path instead of django.conf.urls.url

Author: furlongm

hosts/urls.py

@@ -17,16 +17,15 @@
 
 from __future__ import unicode_literals
 
-from django.conf.urls import url
+from django.urls import path
 
 from hosts import views
 
 app_name = 'hosts'
 
 urlpatterns = [
-    url(r'^$', views.host_list, name='host_list'),
-    url(r'^(?P<hostname>[-.\w]+)/$', views.host_detail, name='host_detail'),
-    url(r'^(?P<hostname>[-.\w]+)/delete/$', views.host_delete,
-        name='host_delete'),
-    url(r'^(?P<hostname>[-.\w]+)/edit/$', views.host_edit, name='host_edit'),
+    path('', views.host_list, name='host_list'),
+    path('<str:hostname>/', views.host_detail, name='host_detail'),
+    path('<str:hostname>/delete/', views.host_delete, name='host_delete'),
+    path('<str:hostname>/edit/', views.host_edit, name='host_edit'),
 ]

operatingsystems/urls.py

@@ -17,19 +17,17 @@
 
 from __future__ import unicode_literals
 
-from django.conf.urls import url
+from django.urls import path
 
 from operatingsystems import views
 
 app_name = 'operatingsystems'
 
 urlpatterns = [
-    url(r'^$', views.os_list, name='os_list'),
-    url(r'^groups/$', views.osgroup_list, name='osgroup_list'),
-    url(r'^(?P<os_id>[-.\w]+)/$', views.os_detail, name='os_detail'),
-    url(r'^(?P<os_id>[-.\w]+)/delete/$', views.os_delete, name='os_delete'),
-    url(r'^groups/(?P<osgroup_id>[-.\w]+)/$', views.osgroup_detail,
-        name='osgroup_detail'),
-    url(r'^groups/(?P<osgroup_id>[-.\w]+)/delete/$', views.osgroup_delete,
-        name='osgroup_delete'),
+    path('', views.os_list, name='os_list'),
+    path('<int:os_id>/', views.os_detail, name='os_detail'),
+    path('<int:os_id>/delete/', views.os_delete, name='os_delete'),
+    path('groups/', views.osgroup_list, name='osgroup_list'),
+    path('groups/<int:osgroup_id>/', views.osgroup_detail, name='osgroup_detail'),  # noqa
+    path('groups/<int:osgroup_id>/delete/', views.osgroup_delete, name='osgroup_delete'),  # noqa
 ]

packages/urls.py

@@ -17,14 +17,13 @@
 
 from __future__ import unicode_literals
 
-from django.conf.urls import url
+from django.urls import path
 
 from packages import views
 
 app_name = 'packages'
 
 urlpatterns = [
-    url(r'^$', views.package_list, name='package_list'),
-    url(r'^(?P<packagename>[_+-.\w]+)/$', views.package_detail,
-        name='package_detail'),
+    path('', views.package_list, name='package_list'),
+    path('<str:packagename>/', views.package_detail, name='package_detail'),
 ]

patchman/urls.py

@@ -17,9 +17,10 @@
 
 from __future__ import unicode_literals
 
-from django.conf.urls import url, include, handler404, handler500  # noqa
+from django.conf.urls import include, handler404, handler500  # noqa
 from django.conf import settings
 from django.contrib import admin
+from django.urls import path
 from django.views import static
 
 from rest_framework import routers
@@ -51,17 +52,17 @@
 admin.autodiscover()
 
 urlpatterns = [
-    url(r'^', include('django.contrib.auth.urls')),
-    url(r'^admin/', admin.site.urls),
-    url(r'^api/', include(router.urls)),
-    url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),  # noqa
-    url(r'^', include('util.urls', namespace='util')),
-    url(r'^reports/', include('reports.urls', namespace='reports')),
-    url(r'^hosts/', include('hosts.urls', namespace='hosts')),
-    url(r'^packages/', include('packages.urls', namespace='packages')),
-    url(r'^repos/', include('repos.urls', namespace='repos')),
-    url(r'^os/', include('operatingsystems.urls', namespace='operatingsystems')),  # noqa
+    path('', include('django.contrib.auth.urls')),
+    path('admin/', admin.site.urls),
+    path('api/', include(router.urls)),
+    path('api-auth/', include('rest_framework.urls', namespace='rest_framework')),  # noqa
+    path('', include('util.urls', namespace='util')),
+    path('reports/', include('reports.urls', namespace='reports')),
+    path('hosts/', include('hosts.urls', namespace='hosts')),
+    path('packages/', include('packages.urls', namespace='packages')),
+    path('repos/', include('repos.urls', namespace='repos')),
+    path('os/', include('operatingsystems.urls', namespace='operatingsystems')),  # noqa
 ]
 
 if settings.DEBUG:
-    urlpatterns += [url(r'^static/(?P<path>.*)$', static.serve)]
+    urlpatterns += [path('static/<str:path>', static.serve)]

reports/urls.py

@@ -17,19 +17,16 @@
 
 from __future__ import unicode_literals
 
-from django.conf.urls import url
+from django.urls import path
 
 from reports import views
 
 app_name = 'reports'
 
 urlpatterns = [
-    url(r'^$', views.report_list, name='report_list'),
-    url(r'^upload/$', views.upload),
-    url(r'^(?P<report>[-.\w]+)/$', views.report_detail,
-        name='report_detail'),
-    url(r'^(?P<report>[-.\w]+)/delete/$', views.report_delete,
-        name='report_delete'),
-    url(r'^(?P<report>[-.\w]+)/process/$', views.report_process,
-        name='report_process'),
+    path('', views.report_list, name='report_list'),
+    path('upload/', views.upload),
+    path('<int:report_id>/', views.report_detail, name='report_detail'),
+    path('<int:report_id>/delete/', views.report_delete, name='report_delete'),
+    path('<int:report_id>/process/', views.report_process, name='report_process'),  # noqa
 ]

reports/views.py

@@ -112,19 +112,19 @@ def report_list(request):
 
 
 @login_required
-def report_detail(request, report):
+def report_detail(request, report_id):
 
-    report = get_object_or_404(Report, id=report)
+    report = get_object_or_404(Report, id=report_id)
 
     return render(request,
                   'reports/report_detail.html',
                   {'report': report}, )
 
 
 @login_required
-def report_process(request, report):
+def report_process(request, report_id):
 
-    report = get_object_or_404(Report, id=report)
+    report = get_object_or_404(Report, id=report_id)
     report.process()
 
     return render(request,
@@ -133,9 +133,9 @@ def report_process(request, report):
 
 
 @login_required
-def report_delete(request, report):
+def report_delete(request, report_id):
 
-    report = get_object_or_404(Report, id=report)
+    report = get_object_or_404(Report, id=report_id)
 
     if request.method == 'POST':
         if 'delete' in request.POST:

repos/urls.py

@@ -17,27 +17,21 @@
 
 from __future__ import unicode_literals
 
-from django.conf.urls import url
+from django.urls import path
 
 from repos import views
 
 app_name = 'repos'
 
 urlpatterns = [
-    url(r'^$', views.repo_list, name='repo_list'),
-    url(r'^(?P<repo_id>[-.\w]+)/delete/$', views.repo_delete,
-        name='repo_delete'),
-    url(r'^(?P<repo_id>[-.\w]+)/toggle_enabled/$', views.repo_toggle_enabled,
-        name='repo_toggle_enabled'),
-    url(r'^(?P<repo_id>[-.\w]+)/toggle_security/$', views.repo_toggle_security,
-        name='repo_toggle_security'),
-    url(r'^(?P<repo_id>[-.\w]+)/edit/$', views.repo_edit, name='repo_edit'),
-    url(r'^mirrors/$', views.mirror_list, name='mirror_list'),
-    url(r'^(?P<repo_id>[-.\w]+)/$', views.repo_detail, name='repo_detail'),
-    url(r'^mirrors/mirror/(?P<mirror_id>[-.\w]+)/$',
-        views.mirror_detail, name='mirror_detail'),
-    url(r'^mirrors/mirror/(?P<mirror_id>[-.\w]+)/delete/$',
-        views.mirror_delete, name='mirror_delete'),
-    url(r'^mirrors/mirror/(?P<mirror_id>[-.\w]+)/edit/$',
-        views.mirror_edit, name='mirror_edit'),
+    path('', views.repo_list, name='repo_list'),
+    path('<int:repo_id>/', views.repo_detail, name='repo_detail'),
+    path('<int:repo_id>/toggle_enabled/', views.repo_toggle_enabled, name='repo_toggle_enabled'),  # noqa
+    path('<int:repo_id>/toggle_security/', views.repo_toggle_security, name='repo_toggle_security'),  # noqa
+    path('<int:repo_id>/edit/', views.repo_edit, name='repo_edit'),
+    path('<int:repo_id>/delete/', views.repo_delete, name='repo_delete'),
+    path('mirrors/', views.mirror_list, name='mirror_list'),
+    path('mirrors/mirror/<int:mirror_id>/', views.mirror_detail, name='mirror_detail'),  # noqa
+    path('mirrors/mirror/<int:mirror_id>/edit/', views.mirror_edit, name='mirror_edit'),  # noqa
+    path('mirrors/mirror/<int:mirror_id>/delete/', views.mirror_delete, name='mirror_delete'),  # noqa
 ]

util/urls.py

@@ -17,14 +17,14 @@
 
 from __future__ import unicode_literals
 
-from django.conf.urls import url
+from django.urls import path
 from django.views.generic import RedirectView
 
 from util import views
 
 app_name = 'util'
 
 urlpatterns = [
-    url(r'^$', RedirectView.as_view(pattern_name='util:dashboard', permanent=True)),  # noqa
-    url(r'^dashboard/$', views.dashboard, name='dashboard'),
+    path('', RedirectView.as_view(pattern_name='util:dashboard', permanent=True)),  # noqa
+    path('dashboard/', views.dashboard, name='dashboard'),
 ]