Merge branch 'django-1.5' into maint

1 files changed, 7 insertions, 9 deletions

diff --git a/src/lib/Bcfg2/Reporting/templatetags/syntax_coloring.py b/src/lib/Bcfg2/Reporting/templatetags/syntax_coloring.py
index 2712d6395..22700689f 100644
--- a/src/lib/Bcfg2/Reporting/templatetags/syntax_coloring.py
+++ b/src/lib/Bcfg2/Reporting/templatetags/syntax_coloring.py
@@ -1,11 +1,8 @@
-import sys
 from django import template
-from django.utils.encoding import smart_unicode
+from django.utils.encoding import smart_str
 from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe
 
-from Bcfg2.Compat import u_str
-
 register = template.Library()
 
 # pylint: disable=E0611
@@ -33,9 +30,9 @@ def syntaxhilight(value, arg="diff", autoescape=None):
 
     if colorize:
         try:
-            output = u_str('<style  type="text/css">') \
-                + smart_unicode(HtmlFormatter().get_style_defs('.highlight')) \
-                + u_str('</style>')
+            output = smart_str('<style  type="text/css">') \
+                + smart_str(HtmlFormatter().get_style_defs('.highlight')) \
+                + smart_str('</style>')
 
             lexer = get_lexer_by_name(arg)
             output += highlight(value, lexer, HtmlFormatter())
@@ -43,6 +40,7 @@ def syntaxhilight(value, arg="diff", autoescape=None):
         except:
             return value
     else:
-        return mark_safe(u_str('<div class="note-box">Tip: Install pygments '
-                               'for highlighting</div><pre>%s</pre>') % value)
+        return mark_safe(smart_str(
+                            '<div class="note-box">Tip: Install pygments '
+                            'for highlighting</div><pre>%s</pre>') % value)
 syntaxhilight.needs_autoescape = True