From dfce4f2fe505326f037c959b5a7183c5b99117a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ekin=20Erta=C3=A7?= <ekinertac@gmail.com>
Date: Wed, 18 Nov 2020 19:12:27 +0300
Subject: [PATCH] url() is deprecated in Django 3.1 (#418)

* replace url()'s with re_path()

* convert re_path to path

* import path instead of re_path

* Convert missed re_path to path

Co-authored-by: Alexandr Artemyev <mogost@gmail.com>
---
 constance/admin.py         | 6 +++---
 example/cheeseshop/urls.py | 5 ++++-
 tests/urls.py              | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/constance/admin.py b/constance/admin.py
index b31d250..5d695b1 100644
--- a/constance/admin.py
+++ b/constance/admin.py
@@ -6,7 +6,6 @@ import hashlib
 
 from django import forms, VERSION, conf
 from django.apps import apps
-from django.conf.urls import url
 from django.contrib import admin, messages
 from django.contrib.admin import widgets
 from django.contrib.admin.options import csrf_protect_m
@@ -21,6 +20,7 @@ from django.utils.formats import localize
 from django.utils.module_loading import import_string
 from django.utils.text import normalize_newlines
 from django.utils.translation import ugettext_lazy as _
+from django.urls import path
 
 from . import LazyConfig, settings
 from .checks import get_inconsistent_fieldnames
@@ -188,10 +188,10 @@ class ConstanceAdmin(admin.ModelAdmin):
     def get_urls(self):
         info = self.model._meta.app_label, self.model._meta.module_name
         return [
-            url(r'^$',
+            path('',
                 self.admin_site.admin_view(self.changelist_view),
                 name='%s_%s_changelist' % info),
-            url(r'^$',
+            path('',
                 self.admin_site.admin_view(self.changelist_view),
                 name='%s_%s_add' % info),
         ]
diff --git a/example/cheeseshop/urls.py b/example/cheeseshop/urls.py
index 5f7645d..d683d63 100644
--- a/example/cheeseshop/urls.py
+++ b/example/cheeseshop/urls.py
@@ -2,10 +2,13 @@ from django.conf.urls import url
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.contrib import admin
 from django.conf import settings
+from django.urls import path
+
+
 admin.autodiscover()
 
 urlpatterns = [
-    url(r'^admin/', admin.site.urls),
+    path('admin/', admin.site.urls),
 ]
 
 if settings.DEBUG:
diff --git a/tests/urls.py b/tests/urls.py
index e04a4e9..a508487 100644
--- a/tests/urls.py
+++ b/tests/urls.py
@@ -1,8 +1,8 @@
 from django.contrib import admin
 
-from django.conf.urls import url
+from django.urls import path
 
 
 urlpatterns = [
-    url(r'^admin/', admin.site.urls),
+    path('admin/', admin.site.urls),
 ]