summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2013-11-16 17:43:44 -0600
committerSol Jerome <sol.jerome@gmail.com>2013-11-16 17:43:44 -0600
commit264b9486bec017a4771c437efa9231a6cf7cf0ef (patch)
tree72addd851003303b27807a4be75f55da2ca033db
parent1a8ede0b74a57a2c51ce26f24771ac334c4758dc (diff)
downloadbcfg2-264b9486bec017a4771c437efa9231a6cf7cf0ef.tar.gz
bcfg2-264b9486bec017a4771c437efa9231a6cf7cf0ef.tar.bz2
bcfg2-264b9486bec017a4771c437efa9231a6cf7cf0ef.zip
Reporting: Remove wildcard imports
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
-rw-r--r--src/lib/Bcfg2/Reporting/Compat.py6
-rw-r--r--src/lib/Bcfg2/Reporting/urls.py2
-rwxr-xr-xsrc/lib/Bcfg2/Reporting/utils.py1
3 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/Bcfg2/Reporting/Compat.py b/src/lib/Bcfg2/Reporting/Compat.py
index 57261970d..9113fdb91 100644
--- a/src/lib/Bcfg2/Reporting/Compat.py
+++ b/src/lib/Bcfg2/Reporting/Compat.py
@@ -10,9 +10,7 @@ if VERSION[0] == 1 and VERSION[1] < 6:
try:
# Django < 1.6
- from django.conf.urls import defaults
- django_urls = defaults
+ from django.conf.urls.defaults import url, patterns
except ImportError:
# Django > 1.6
- from django.conf import urls
- django_urls = urls
+ from django.conf.urls import url, patterns
diff --git a/src/lib/Bcfg2/Reporting/urls.py b/src/lib/Bcfg2/Reporting/urls.py
index a9e5690be..3a40cb932 100644
--- a/src/lib/Bcfg2/Reporting/urls.py
+++ b/src/lib/Bcfg2/Reporting/urls.py
@@ -1,4 +1,4 @@
-from Bcfg2.Reporting.Compat.django_urls import *
+from Bcfg2.Reporting.Compat import url, patterns # django compat imports
from django.core.urlresolvers import reverse, NoReverseMatch
from django.http import HttpResponsePermanentRedirect
from Bcfg2.Reporting.utils import filteredUrls, paginatedUrls, timeviewUrls
diff --git a/src/lib/Bcfg2/Reporting/utils.py b/src/lib/Bcfg2/Reporting/utils.py
index d9b8213b1..0d394fcd8 100755
--- a/src/lib/Bcfg2/Reporting/utils.py
+++ b/src/lib/Bcfg2/Reporting/utils.py
@@ -1,5 +1,4 @@
"""Helper functions for reports"""
-from Bcfg2.Reporting.Compat.django_urls import *
import re
"""List of filters provided by filteredUrls"""