summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Reports
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2012-06-05 17:00:40 -0500
committerSol Jerome <sol.jerome@gmail.com>2012-06-05 17:00:40 -0500
commit200f79387247eefa01d60e4f6e573ba5162054bc (patch)
tree489a8c5b3f4682374b565e602d71b2906f77c3f6 /src/lib/Bcfg2/Server/Reports
parentf31d06a61e3a246118bab537923e1039ba3a2571 (diff)
downloadbcfg2-200f79387247eefa01d60e4f6e573ba5162054bc.tar.gz
bcfg2-200f79387247eefa01d60e4f6e573ba5162054bc.tar.bz2
bcfg2-200f79387247eefa01d60e4f6e573ba5162054bc.zip
PY3K: Refactor input code
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Bcfg2/Server/Reports')
-rw-r--r--src/lib/Bcfg2/Server/Reports/reports/templatetags/syntax_coloring.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templatetags/syntax_coloring.py b/src/lib/Bcfg2/Server/Reports/reports/templatetags/syntax_coloring.py
index 36d4cf693..0d4c6501d 100644
--- a/src/lib/Bcfg2/Server/Reports/reports/templatetags/syntax_coloring.py
+++ b/src/lib/Bcfg2/Server/Reports/reports/templatetags/syntax_coloring.py
@@ -4,6 +4,8 @@ from django.utils.encoding import smart_unicode
from django.utils.html import conditional_escape
from django.utils.safestring import mark_safe
+from Bcfg2.Bcfg2Py3k import u_str
+
register = template.Library()
try:
@@ -16,14 +18,6 @@ except:
colorize = False
-# py3k compatibility
-def u_str(string):
- if sys.hexversion >= 0x03000000:
- return string
- else:
- return unicode(string)
-
-
@register.filter
def syntaxhilight(value, arg="diff", autoescape=None):
"""