diff options
author | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2016-08-18 16:09:11 +0200 |
---|---|---|
committer | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2016-08-18 16:16:47 +0200 |
commit | c1dea2a8676c0acdf51b68d0d38d454746bc96d8 (patch) | |
tree | f04723ba8ec1af9fd2aded86e1f8d5ffd71de085 /src/lib/Bcfg2/Reporting | |
parent | bbf5da0f5e5dcfccb624067af9ed924ff172d0de (diff) | |
download | bcfg2-c1dea2a8676c0acdf51b68d0d38d454746bc96d8.tar.gz bcfg2-c1dea2a8676c0acdf51b68d0d38d454746bc96d8.tar.bz2 bcfg2-c1dea2a8676c0acdf51b68d0d38d454746bc96d8.zip |
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.
Diffstat (limited to 'src/lib/Bcfg2/Reporting')
-rw-r--r-- | src/lib/Bcfg2/Reporting/Compat.py | 14 |
1 files changed, 13 insertions, 1 deletions
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 |