From c1dea2a8676c0acdf51b68d0d38d454746bc96d8 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Thu, 18 Aug 2016 16:09:11 +0200 Subject: Reporting/Compat: Add patterns compat method django 1.10 removed the patterns method, so we define it manually a bit easier than the old upstream variant but sufficient for our needs. --- src/lib/Bcfg2/Reporting/Compat.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/lib/Bcfg2/Reporting') diff --git a/src/lib/Bcfg2/Reporting/Compat.py b/src/lib/Bcfg2/Reporting/Compat.py index 9113fdb91..9754314a7 100644 --- a/src/lib/Bcfg2/Reporting/Compat.py +++ b/src/lib/Bcfg2/Reporting/Compat.py @@ -13,4 +13,16 @@ try: from django.conf.urls.defaults import url, patterns except ImportError: # Django > 1.6 - from django.conf.urls import url, patterns + from django.conf.urls import url + + try: + from django.conf.urls import patterns + except: + # Django > 1.10 + def patterns(_prefix, urls): + url_list = list() + for u in urls: + if isinstance(url_tuple, (list, tuple)): + u = url(*u) + url_list.append(u) + return url_list -- cgit v1.2.3-1-g7c22