Replaced url() with re_path()

Author: AbhishekSrikanth

devel/urls.py

@@ -1,20 +1,20 @@
-from django.conf.urls import url
+from django.urls import re_path
 
 from devel import views
 
 
 urlpatterns = [
-    url(r'^admin_log/$', views.admin_log),
-    url(r'^admin_log/(?P<username>.*)/$', views.admin_log),
-    url(r'^clock/$',    views.clock, name='devel-clocks'),
-    url(r'^tier0mirror/$',    views.tier0_mirror, name='tier0-mirror'),
-    url(r'^mirrorauth/$',    views.tier0_mirror_auth, name='tier0-mirror-atuh'),
-    url(r'^$',          views.index, name='devel-index'),
-    url(r'^stats/$',    views.stats, name='devel-stats'),
-    url(r'^newuser/$',  views.new_user_form),
-    url(r'^profile/$',  views.change_profile),
-    url(r'^reports/(?P<report_name>.*)/(?P<username>.*)/$', views.report),
-    url(r'^reports/(?P<report_name>.*)/$', views.report),
+    re_path(r'^admin_log/$', views.admin_log),
+    re_path(r'^admin_log/(?P<username>.*)/$', views.admin_log),
+    re_path(r'^clock/$',    views.clock, name='devel-clocks'),
+    re_path(r'^tier0mirror/$',    views.tier0_mirror, name='tier0-mirror'),
+    re_path(r'^mirrorauth/$',    views.tier0_mirror_auth, name='tier0-mirror-atuh'),
+    re_path(r'^$',          views.index, name='devel-index'),
+    re_path(r'^stats/$',    views.stats, name='devel-stats'),
+    re_path(r'^newuser/$',  views.new_user_form),
+    re_path(r'^profile/$',  views.change_profile),
+    re_path(r'^reports/(?P<report_name>.*)/(?P<username>.*)/$', views.report),
+    re_path(r'^reports/(?P<report_name>.*)/$', views.report),
 ]
 
 # vim: set ts=4 sw=4 et:

mirrors/urls.py

@@ -1,20 +1,20 @@
-from django.conf.urls import url
+from django.urls import re_path
 from django.views.decorators.cache import cache_page
 
 from .views import mirrors, status, mirror_details, url_details
 from .views.api import status_json, mirror_details_json, locations_json
 
 urlpatterns = [
-    url(r'^$', mirrors, name='mirror-list'),
-    url(r'^tier/(?P<tier>\d+)/$', mirrors, name='mirror-list-tier'),
-    url(r'^status/$', status, name='mirror-status'),
-    url(r'^status/json/$', status_json, name='mirror-status-json'),
-    url(r'^status/tier/(?P<tier>\d+)/$', status, name='mirror-status-tier'),
-    url(r'^status/tier/(?P<tier>\d+)/json/$', status_json, name='mirror-status-tier-json'),
-    url(r'^locations/json/$', cache_page(317)(locations_json), name='mirror-locations-json'),
-    url(r'^(?P<name>[\.\-\w]+)/$', mirror_details),
-    url(r'^(?P<name>[\.\-\w]+)/json/$', mirror_details_json),
-    url(r'^(?P<name>[\.\-\w]+)/(?P<url_id>\d+)/$', url_details),
+    re_path(r'^$', mirrors, name='mirror-list'),
+    re_path(r'^tier/(?P<tier>\d+)/$', mirrors, name='mirror-list-tier'),
+    re_path(r'^status/$', status, name='mirror-status'),
+    re_path(r'^status/json/$', status_json, name='mirror-status-json'),
+    re_path(r'^status/tier/(?P<tier>\d+)/$', status, name='mirror-status-tier'),
+    re_path(r'^status/tier/(?P<tier>\d+)/json/$', status_json, name='mirror-status-tier-json'),
+    re_path(r'^locations/json/$', cache_page(317)(locations_json), name='mirror-locations-json'),
+    re_path(r'^(?P<name>[\.\-\w]+)/$', mirror_details),
+    re_path(r'^(?P<name>[\.\-\w]+)/json/$', mirror_details_json),
+    re_path(r'^(?P<name>[\.\-\w]+)/(?P<url_id>\d+)/$', url_details),
 ]
 
 # vim: set ts=4 sw=4 et:

mirrors/urls_mirrorlist.py

@@ -1,11 +1,10 @@
-from django.conf.urls import url
-
+from django.urls import re_path
 from mirrors.views import mirrorlist as views
 
 urlpatterns = [
-    url(r'^$', views.generate_mirrorlist, name='mirrorlist'),
-    url(r'^all/$', views.find_mirrors, {'countries': ['all']}),
-    url(r'^all/(?P<protocol>[A-z]+)/$', views.find_mirrors_simple, name='mirrorlist_simple')
+    re_path(r'^$', views.generate_mirrorlist, name='mirrorlist'),
+    re_path(r'^all/$', views.find_mirrors, {'countries': ['all']}),
+    re_path(r'^all/(?P<protocol>[A-z]+)/$', views.find_mirrors_simple, name='mirrorlist_simple')
 ]
 
 # vim: set ts=4 sw=4 et:

news/urls.py

@@ -1,23 +1,23 @@
-from django.conf.urls import url
+from django.urls import re_path
 from django.contrib.auth.decorators import permission_required
 from .views import (NewsDetailView, NewsListView, NewsCreateView, NewsEditView,
                     NewsDeleteView, preview, view_redirect)
 
 
 urlpatterns = [
-    url(r'^$', NewsListView.as_view(), name='news-list'),
+    re_path(r'^$', NewsListView.as_view(), name='news-list'),
 
-    url(r'^preview/$', preview),
+    re_path(r'^preview/$', preview),
     # old news URLs, permanent redirect view so we don't break all links
-    url(r'^(?P<object_id>\d+)/$', view_redirect),
+    re_path(r'^(?P<object_id>\d+)/$', view_redirect),
 
-    url(r'^add/$',
+    re_path(r'^add/$',
         permission_required('news.add_news')(NewsCreateView.as_view())),
-    url(r'^(?P<slug>[-\w]+)/$',
+    re_path(r'^(?P<slug>[-\w]+)/$',
         NewsDetailView.as_view()),
-    url(r'^(?P<slug>[-\w]+)/edit/$',
+    re_path(r'^(?P<slug>[-\w]+)/edit/$',
         permission_required('news.change_news')(NewsEditView.as_view())),
-    url(r'^(?P<slug>[-\w]+)/delete/$',
+    re_path(r'^(?P<slug>[-\w]+)/delete/$',
         permission_required('news.delete_news')(NewsDeleteView.as_view())),
 ]
 

packages/urls.py

@@ -1,45 +1,45 @@
-from django.conf.urls import include, url
-
+from django.conf.urls import include
+from django.urls import re_path
 from packages import views
 from packages.views import display, flag, signoff, search
 
 
 package_patterns = [
-    url(r'^$', display.details),
-    url(r'^json/$', display.details_json),
-    url(r'^files/$', display.files),
-    url(r'^files/json/$', display.files_json),
-    url(r'^flag/$', flag.flag),
-    url(r'^flag/done/$', flag.flag_confirmed, name='package-flag-confirmed'),
-    url(r'^unflag/$', flag.unflag),
-    url(r'^unflag/all/$', flag.unflag_all),
-    url(r'^signoff/$', signoff.signoff_package),
-    url(r'^signoff/revoke/$', signoff.signoff_package, {'revoke': True}),
-    url(r'^signoff/options/$', signoff.signoff_options),
-    url(r'^download/$', display.download),
-    url(r'^download.sig/$', display.download, {'sig': True}),
-    url(r'^sonames/$', display.sonames),
-    url(r'^sonames/json/$', display.sonames_json),
+    re_path(r'^$', display.details),
+    re_path(r'^json/$', display.details_json),
+    re_path(r'^files/$', display.files),
+    re_path(r'^files/json/$', display.files_json),
+    re_path(r'^flag/$', flag.flag),
+    re_path(r'^flag/done/$', flag.flag_confirmed, name='package-flag-confirmed'),
+    re_path(r'^unflag/$', flag.unflag),
+    re_path(r'^unflag/all/$', flag.unflag_all),
+    re_path(r'^signoff/$', signoff.signoff_package),
+    re_path(r'^signoff/revoke/$', signoff.signoff_package, {'revoke': True}),
+    re_path(r'^signoff/options/$', signoff.signoff_options),
+    re_path(r'^download/$', display.download),
+    re_path(r'^download.sig/$', display.download, {'sig': True}),
+    re_path(r'^sonames/$', display.sonames),
+    re_path(r'^sonames/json/$', display.sonames_json),
 ]
 
 urlpatterns = [
-    url(r'^flaghelp/$', flag.flaghelp),
-    url(r'^signoffs/$', signoff.signoffs, name='package-signoffs'),
-    url(r'^signoffs/json/$', signoff.signoffs_json, name='package-signoffs-json'),
-    url(r'^update/$', views.update),
-    url(r'^sonames$', views.sonames),
+    re_path(r'^flaghelp/$', flag.flaghelp),
+    re_path(r'^signoffs/$', signoff.signoffs, name='package-signoffs'),
+    re_path(r'^signoffs/json/$', signoff.signoffs_json, name='package-signoffs-json'),
+    re_path(r'^update/$', views.update),
+    re_path(r'^sonames$', views.sonames),
 
-    url(r'^$', search.SearchListView.as_view(), name='packages-search'),
-    url(r'^search/json/$', search.search_json),
+    re_path(r'^$', search.SearchListView.as_view(), name='packages-search'),
+    re_path(r'^search/json/$', search.search_json),
 
-    url(r'^differences/$', views.arch_differences, name='packages-differences'),
-    url(r'^stale_relations/$', views.stale_relations),
-    url(r'^stale_relations/update/$', views.stale_relations_update),
+    re_path(r'^differences/$', views.arch_differences, name='packages-differences'),
+    re_path(r'^stale_relations/$', views.stale_relations),
+    re_path(r'^stale_relations/update/$', views.stale_relations_update),
 
-    url(r'^(?P<name>[^ /]+)/$', display.details),
-    url(r'^(?P<repo>[A-z0-9\-]+)/(?P<name>[^ /]+)/$', display.details),
+    re_path(r'^(?P<name>[^ /]+)/$', display.details),
+    re_path(r'^(?P<repo>[A-z0-9\-]+)/(?P<name>[^ /]+)/$', display.details),
     # canonical package url. subviews defined above
-    url(r'^(?P<repo>[A-z0-9\-]+)/(?P<arch>[A-z0-9]+)/(?P<name>[^ /]+)/', include(package_patterns)),
+    re_path(r'^(?P<repo>[A-z0-9\-]+)/(?P<arch>[A-z0-9]+)/(?P<name>[^ /]+)/', include(package_patterns)),
 ]
 
 # vim: set ts=4 sw=4 et:

packages/urls_groups.py

@@ -1,11 +1,10 @@
-from django.conf.urls import url
-
+from django.urls import re_path
 from packages.views.display import groups, group_details
 
 urlpatterns = [
-    url(r'^$', groups, name='groups-list'),
-    url(r'^(?P<arch>[A-z0-9]+)/$', groups),
-    url(r'^(?P<arch>[A-z0-9]+)/(?P<name>[^ /]+)/$', group_details),
+    re_path(r'^$', groups, name='groups-list'),
+    re_path(r'^(?P<arch>[A-z0-9]+)/$', groups),
+    re_path(r'^(?P<arch>[A-z0-9]+)/(?P<name>[^ /]+)/$', group_details),
 ]
 
 # vim: set ts=4 sw=4 et:

releng/urls.py

@@ -1,23 +1,23 @@
-from django.conf.urls import include, url
-
+from django.conf.urls import include
+from django.urls import re_path
 from .views import ReleaseListView, ReleaseDetailView
 from releng import views
 
 releases_patterns = [
-    url(r'^$', ReleaseListView.as_view(), name='releng-release-list'),
-    url(r'^json/$', views.releases_json, name='releng-release-list-json'),
-    url(r'^(?P<version>[-.\w]+)/$', ReleaseDetailView.as_view(), name='releng-release-detail'),
-    url(r'^(?P<version>[-.\w]+)/torrent/$', views.release_torrent, name='releng-release-torrent'),
+    re_path(r'^$', ReleaseListView.as_view(), name='releng-release-list'),
+    re_path(r'^json/$', views.releases_json, name='releng-release-list-json'),
+    re_path(r'^(?P<version>[-.\w]+)/$', ReleaseDetailView.as_view(), name='releng-release-detail'),
+    re_path(r'^(?P<version>[-.\w]+)/torrent/$', views.release_torrent, name='releng-release-torrent'),
 ]
 
 netboot_patterns = [
-    url(r'^archlinux\.ipxe$', views.netboot_config, name='releng-netboot-config'),
-    url(r'^$', views.netboot_info, name='releng-netboot-info')
+    re_path(r'^archlinux\.ipxe$', views.netboot_config, name='releng-netboot-config'),
+    re_path(r'^$', views.netboot_info, name='releng-netboot-info')
 ]
 
 urlpatterns = [
-    url(r'^releases/', include(releases_patterns)),
-    url(r'^netboot/', include(netboot_patterns)),
+    re_path(r'^releases/', include(releases_patterns)),
+    re_path(r'^netboot/', include(netboot_patterns)),
 ]
 
 # vim: set ts=4 sw=4 et:

todolists/urls.py

@@ -1,23 +1,23 @@
-from django.conf.urls import url
+from django.urls import re_path
 from django.contrib.auth.decorators import permission_required
 
 from .views import (view, view_json, add, edit, flag,
                     list_pkgbases, DeleteTodolist, TodolistListView)
 
 urlpatterns = [
-    url(r'^$', TodolistListView.as_view(), name='todolist-list'),
+    re_path(r'^$', TodolistListView.as_view(), name='todolist-list'),
 
-    url(r'^add/$',
+    re_path(r'^add/$',
         permission_required('todolists.add_todolist')(add)),
-    url(r'^(?P<slug>[-\w]+)/$', view),
-    url(r'^(?P<slug>[-\w]+)/json$', view_json),
-    url(r'^(?P<slug>[-\w]+)/edit/$',
+    re_path(r'^(?P<slug>[-\w]+)/$', view),
+    re_path(r'^(?P<slug>[-\w]+)/json$', view_json),
+    re_path(r'^(?P<slug>[-\w]+)/edit/$',
         permission_required('todolists.change_todolist')(edit)),
-    url(r'^(?P<slug>[-\w]+)/delete/$',
+    re_path(r'^(?P<slug>[-\w]+)/delete/$',
         permission_required('todolists.delete_todolist')(DeleteTodolist.as_view())),
-    url(r'^(?P<slug>[-\w]+)/flag/(?P<pkg_id>\d+)/$',
+    re_path(r'^(?P<slug>[-\w]+)/flag/(?P<pkg_id>\d+)/$',
         permission_required('todolists.change_todolistpackage')(flag)),
-    url(r'^(?P<slug>[-\w]+)/pkgbases/(?P<svn_root>[a-z]+)/$',
+    re_path(r'^(?P<slug>[-\w]+)/pkgbases/(?P<svn_root>[a-z]+)/$',
         list_pkgbases),
 ]
 

urls.py

@@ -1,5 +1,4 @@
-from django.conf.urls import url
-from django.urls import include, path
+from django.urls import include, path, re_path
 from django.contrib import admin
 from django.contrib.sitemaps import views as sitemap_views
 from django.contrib.auth import views as auth_views
@@ -41,74 +40,74 @@
 
 # Public pages
 urlpatterns.extend([
-    url(r'^$', public.views.index, name='index'),
-    url(r'^about/$', TemplateView.as_view(template_name='public/about.html'), name='page-about'),
-    url(r'^art/$',   TemplateView.as_view(template_name='public/art.html'), name='page-art'),
-    url(r'^svn/$',   TemplateView.as_view(template_name='public/svn.html'), name='page-svn'),
-    url(r'^donate/$', public.views.donate, name='page-donate'),
-    url(r'^download/$', public.views.download, name='page-download'),
-    url(r'^master-keys/$', public.views.keys, name='page-keys'),
-    url(r'^master-keys/json/$', public.views.keys_json, name='pgp-keys-json'),
-    url(r'^people/(?P<slug>[-\w]+)/$', public.views.people, name='people'),
-    url(r'^planet/$', planet.views.index, name='planet'),
+    re_path(r'^$', public.views.index, name='index'),
+    re_path(r'^about/$', TemplateView.as_view(template_name='public/about.html'), name='page-about'),
+    re_path(r'^art/$',   TemplateView.as_view(template_name='public/art.html'), name='page-art'),
+    re_path(r'^svn/$',   TemplateView.as_view(template_name='public/svn.html'), name='page-svn'),
+    re_path(r'^donate/$', public.views.donate, name='page-donate'),
+    re_path(r'^download/$', public.views.download, name='page-download'),
+    re_path(r'^master-keys/$', public.views.keys, name='page-keys'),
+    re_path(r'^master-keys/json/$', public.views.keys_json, name='pgp-keys-json'),
+    re_path(r'^people/(?P<slug>[-\w]+)/$', public.views.people, name='people'),
+    re_path(r'^planet/$', planet.views.index, name='planet'),
 ])
 
 # Feeds patterns, used below
 feeds_patterns = [
-    url(r'^$', public.views.feeds, name='feeds-list'),
-    url(r'^news/$', cache_page(311)(NewsFeed())),
-    url(r'^packages/$', cache_page(313)(PackageFeed())),
-    url(r'^packages/(added|removed)/$', cache_page(313)(PackageUpdatesFeed())),
-    url(r'^packages/(added|removed)/(?P<arch>[A-z0-9]+)/$', cache_page(313)(PackageUpdatesFeed())),
-    url(r'^packages/(added|removed)/all/(?P<repo>[A-z0-9\-]+)/$', cache_page(313)(PackageUpdatesFeed())),
-    url(r'^packages/(added|removed)/(?P<arch>[A-z0-9]+)/(?P<repo>[A-z0-9\-]+)/$',
+    re_path(r'^$', public.views.feeds, name='feeds-list'),
+    re_path(r'^news/$', cache_page(311)(NewsFeed())),
+    re_path(r'^packages/$', cache_page(313)(PackageFeed())),
+    re_path(r'^packages/(added|removed)/$', cache_page(313)(PackageUpdatesFeed())),
+    re_path(r'^packages/(added|removed)/(?P<arch>[A-z0-9]+)/$', cache_page(313)(PackageUpdatesFeed())),
+    re_path(r'^packages/(added|removed)/all/(?P<repo>[A-z0-9\-]+)/$', cache_page(313)(PackageUpdatesFeed())),
+    re_path(r'^packages/(added|removed)/(?P<arch>[A-z0-9]+)/(?P<repo>[A-z0-9\-]+)/$',
         cache_page(313)(PackageUpdatesFeed())),
-    url(r'^packages/(?P<arch>[A-z0-9]+)/$', cache_page(313)(PackageFeed())),
-    url(r'^packages/all/(?P<repo>[A-z0-9\-]+)/$', cache_page(313)(PackageFeed())),
-    url(r'^packages/(?P<arch>[A-z0-9]+)/(?P<repo>[A-z0-9\-]+)/$', cache_page(313)(PackageFeed())),
-    url(r'^releases/$', cache_page(317)(ReleaseFeed())),
-    url(r'^planet/$', cache_page(317)(PlanetFeed()), name='planet-feed'),
+    re_path(r'^packages/(?P<arch>[A-z0-9]+)/$', cache_page(313)(PackageFeed())),
+    re_path(r'^packages/all/(?P<repo>[A-z0-9\-]+)/$', cache_page(313)(PackageFeed())),
+    re_path(r'^packages/(?P<arch>[A-z0-9]+)/(?P<repo>[A-z0-9\-]+)/$', cache_page(313)(PackageFeed())),
+    re_path(r'^releases/$', cache_page(317)(ReleaseFeed())),
+    re_path(r'^planet/$', cache_page(317)(PlanetFeed()), name='planet-feed'),
 ]
 
 # Old planet.archlinux.org redirects, to be removed once people have migrated.
 urlpatterns.extend([
-    url(r'^planet/rss20.xml$', cache_page(317)(PlanetFeed())),
-    url(r'^planet/atom.xml$', cache_page(317)(PlanetFeed())),
+    re_path(r'^planet/rss20.xml$', cache_page(317)(PlanetFeed())),
+    re_path(r'^planet/atom.xml$', cache_page(317)(PlanetFeed())),
 ])
 
 # Includes and other remaining stuff
 urlpatterns.extend([
-    url(r'^admin/', admin.site.urls),
-    url(r'^devel/', include(devel.urls)),
-    url(r'^feeds/', include(feeds_patterns)),
-    url(r'^groups/', include(packages.urls_groups)),
-    url(r'^mirrorlist/', include(mirrors.urls_mirrorlist)),
-    url(r'^mirrors/', include(mirrors.urls)),
-    url(r'^news/', include(news.urls)),
-    url(r'^packages/', include(packages.urls)),
-    url(r'^releng/', include(releng.urls)),
-    url(r'^todo/', include(todolists.urls)),
-    url(r'^visualize/', include(visualize.urls)),
-    url(r'^opensearch/packages/$', packages.views.opensearch, name='opensearch-packages'),
-    url(r'^opensearch/packages/suggest$', packages.views.opensearch_suggest, name='opensearch-packages-suggest'),
+    re_path(r'^admin/', admin.site.urls),
+    re_path(r'^devel/', include(devel.urls)),
+    re_path(r'^feeds/', include(feeds_patterns)),
+    re_path(r'^groups/', include(packages.urls_groups)),
+    re_path(r'^mirrorlist/', include(mirrors.urls_mirrorlist)),
+    re_path(r'^mirrors/', include(mirrors.urls)),
+    re_path(r'^news/', include(news.urls)),
+    re_path(r'^packages/', include(packages.urls)),
+    re_path(r'^releng/', include(releng.urls)),
+    re_path(r'^todo/', include(todolists.urls)),
+    re_path(r'^visualize/', include(visualize.urls)),
+    re_path(r'^opensearch/packages/$', packages.views.opensearch, name='opensearch-packages'),
+    re_path(r'^opensearch/packages/suggest$', packages.views.opensearch_suggest, name='opensearch-packages-suggest'),
 ])
 
 # Sitemaps
 urlpatterns.extend([
-    url(r'^sitemap.xml$', cache_page(1831)(sitemap_views.index),
+    re_path(r'^sitemap.xml$', cache_page(1831)(sitemap_views.index),
         {'sitemaps': our_sitemaps, 'sitemap_url_name': 'sitemaps'}),
-    url(r'^sitemap-(?P<section>.+)\.xml$', cache_page(1831)(sitemap_views.sitemap),
+    re_path(r'^sitemap-(?P<section>.+)\.xml$', cache_page(1831)(sitemap_views.sitemap),
         {'sitemaps': our_sitemaps, 'template_name': 'sitemaps/sitemap.xml'},
         name='sitemaps'),
-    url(r'^news-sitemap\.xml$', cache_page(1831)(sitemap_views.sitemap),
+    re_path(r'^news-sitemap\.xml$', cache_page(1831)(sitemap_views.sitemap),
         {'sitemaps': news_sitemaps, 'template_name': 'sitemaps/news_sitemap.xml'},
         name='news-sitemap'),
 ])
 
 # Authentication
 urlpatterns.extend([
-    url(r'^login/$', auth_views.LoginView.as_view(template_name='registration/login.html'), name='login'),
-    url(r'^logout/$', auth_views.LogoutView.as_view(template_name='registration/logout.html'), name='logout'),
+    re_path(r'^login/$', auth_views.LoginView.as_view(template_name='registration/login.html'), name='login'),
+    re_path(r'^logout/$', auth_views.LogoutView.as_view(template_name='registration/logout.html'), name='logout'),
 ])
 
 # django-toolbar