From 44af447d030e519c4ac22175507dac3e26ec4b05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonah=20Br=C3=BCchert?= Date: Thu, 23 May 2024 03:56:14 +0200 Subject: Adapt to moved django url functions --- src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py | 3 +-- src/lib/Bcfg2/Reporting/urls.py | 2 +- src/lib/Bcfg2/Reporting/views.py | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py b/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py index 6f86cd3a3..b42c10766 100644 --- a/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py +++ b/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py @@ -4,8 +4,7 @@ from copy import copy import django from django import template from django.conf import settings -from django.core.urlresolvers import resolve, reverse, \ - Resolver404, NoReverseMatch +from django.urls import resolve, reverse, Resolver404, NoReverseMatch from django.utils.encoding import smart_str from django.utils.safestring import mark_safe from datetime import datetime, timedelta diff --git a/src/lib/Bcfg2/Reporting/urls.py b/src/lib/Bcfg2/Reporting/urls.py index 1ff955cad..adc0e2e36 100644 --- a/src/lib/Bcfg2/Reporting/urls.py +++ b/src/lib/Bcfg2/Reporting/urls.py @@ -1,5 +1,5 @@ from Bcfg2.Reporting.Compat import url, patterns # django compat imports -from django.core.urlresolvers import reverse, NoReverseMatch +from django.urls import reverse, NoReverseMatch from django.http import HttpResponsePermanentRedirect from Bcfg2.Reporting.utils import filteredUrls, paginatedUrls, timeviewUrls from Bcfg2.Reporting import views diff --git a/src/lib/Bcfg2/Reporting/views.py b/src/lib/Bcfg2/Reporting/views.py index cef0958d9..e18b0c2e1 100644 --- a/src/lib/Bcfg2/Reporting/views.py +++ b/src/lib/Bcfg2/Reporting/views.py @@ -11,8 +11,7 @@ from django.template import Context from django.http import \ HttpResponse, HttpResponseRedirect, HttpResponseServerError, Http404 from django.shortcuts import render, get_object_or_404 -from django.core.urlresolvers import \ - resolve, reverse, Resolver404, NoReverseMatch +from django.urls import resolve, reverse, Resolver404, NoReverseMatch from django.db import DatabaseError from django.db.models import Q, Count -- cgit v1.2.3-1-g7c22