From 7ad74c99e446a6c29e7f1e19d1ad9fc737c171a6 Mon Sep 17 00:00:00 2001 From: Jennifer Richards Date: Fri, 12 May 2023 20:29:11 -0300 Subject: [PATCH] refactor: import from django.urls instead of django.conf.urls --- ietf/api/urls.py | 2 +- ietf/doc/urls.py | 4 ++-- ietf/group/urls.py | 2 +- ietf/meeting/urls.py | 4 ++-- ietf/secr/urls.py | 2 +- ietf/urls.py | 3 +-- ietf/utils/urls.py | 4 ++-- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ietf/api/urls.py b/ietf/api/urls.py index 5185b9f88..7ee55cf70 100644 --- a/ietf/api/urls.py +++ b/ietf/api/urls.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2017, All Rights Reserved from django.conf import settings -from django.conf.urls import include +from django.urls import include from django.views.generic import TemplateView from ietf import api diff --git a/ietf/doc/urls.py b/ietf/doc/urls.py index edfb89f38..f4b672804 100644 --- a/ietf/doc/urls.py +++ b/ietf/doc/urls.py @@ -33,9 +33,9 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from django.conf.urls import include -from django.views.generic import RedirectView from django.conf import settings +from django.urls import include +from django.views.generic import RedirectView from ietf.doc import views_search, views_draft, views_ballot, views_status_change, views_doc, views_downref, views_stats, views_help, views_bofreq from ietf.utils.urls import url diff --git a/ietf/group/urls.py b/ietf/group/urls.py index 713a0b7ee..0e4f7ef2f 100644 --- a/ietf/group/urls.py +++ b/ietf/group/urls.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2013-2020, All Rights Reserved from django.conf import settings -from django.conf.urls import include +from django.urls import include from django.views.generic import RedirectView from ietf.community import views as community_views diff --git a/ietf/meeting/urls.py b/ietf/meeting/urls.py index 8284f8fcf..d7a623899 100644 --- a/ietf/meeting/urls.py +++ b/ietf/meeting/urls.py @@ -1,8 +1,8 @@ # Copyright The IETF Trust 2007-2020, All Rights Reserved -from django.conf.urls import include -from django.views.generic import RedirectView from django.conf import settings +from django.urls import include +from django.views.generic import RedirectView from ietf.meeting import views, views_proceedings from ietf.utils.urls import url diff --git a/ietf/secr/urls.py b/ietf/secr/urls.py index 8e80af62c..e5d3c19c3 100644 --- a/ietf/secr/urls.py +++ b/ietf/secr/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import re_path, include +from django.urls import re_path, include from django.views.generic import TemplateView urlpatterns = [ diff --git a/ietf/urls.py b/ietf/urls.py index 972e06cb3..8eb08b8d0 100644 --- a/ietf/urls.py +++ b/ietf/urls.py @@ -1,15 +1,14 @@ # Copyright The IETF Trust 2007-2022, All Rights Reserved from django.conf import settings -from django.conf.urls import include from django.conf.urls.static import static as static_url from django.contrib import admin from django.contrib.sitemaps import views as sitemap_views from django.contrib.staticfiles.urls import staticfiles_urlpatterns +from django.urls import include, path from django.views import static as static_view from django.views.generic import TemplateView from django.views.defaults import server_error -from django.urls import path import debug # pyflakes:ignore diff --git a/ietf/utils/urls.py b/ietf/utils/urls.py index 9be48e16b..9c26da724 100644 --- a/ietf/utils/urls.py +++ b/ietf/utils/urls.py @@ -6,9 +6,9 @@ import debug # pyflakes:ignore from inspect import isclass -from django.conf.urls import re_path -from django.views.generic import View +from django.urls import re_path from django.utils.encoding import force_str +from django.views.generic import View def url(regex, view, kwargs=None, name=None): if callable(view) and hasattr(view, '__name__'):