Reports: Add full PY3K compatibility

Note that Django still doesn't yet support version 3 so this won't
necessarily work until there is a compatible version of django available
for use.

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

3 files changed, 20 insertions, 10 deletions

diff --git a/src/lib/Server/Reports/reports/templatetags/bcfg2_tags.py b/src/lib/Server/Reports/reports/templatetags/bcfg2_tags.py
index 2d210cc07..629984f26 100644
--- a/src/lib/Server/Reports/reports/templatetags/bcfg2_tags.py
+++ b/src/lib/Server/Reports/reports/templatetags/bcfg2_tags.py
@@ -21,9 +21,9 @@ def page_navigator(context):
         path = context['request'].META['PATH_INFO']
         total_pages = int(context['total_pages'])
         records_per_page = int(context['records_per_page'])
-    except KeyError, e:
+    except KeyError:
         return fragment
-    except ValueError, e:
+    except ValueError:
         return fragment
 
     if total_pages < 2:
@@ -84,7 +84,8 @@ def page_navigator(context):
               
     except Resolver404:
        path = "404"
-    except NoReverseMatch, nr:
+    except NoReverseMatch:
+       nr = sys.exc_info()[1]
        path = "NoReverseMatch: %s" % nr
     except ValueError:
        path = "ValueError"
@@ -193,12 +194,13 @@ class AddUrlFilter(template.Node):
                     del kwargs['server']
                 try:
                     link = reverse(view, args=args, kwargs=kwargs)
-                except NoReverseMatch, rm: 
+                except NoReverseMatch:
                     link = reverse(self.fallback_view, args=None,
                         kwargs={ filter_name: filter_value })
-        except NoReverseMatch, rm:
+        except NoReverseMatch:
+            rm = sys.exc_info()[1]
             raise rm
-        except (Resolver404, ValueError), e:
+        except (Resolver404, ValueError):
             pass
         return link
 
diff --git a/src/lib/Server/Reports/reports/templatetags/syntax_coloring.py b/src/lib/Server/Reports/reports/templatetags/syntax_coloring.py
index 43dafb262..291528e2e 100644
--- a/src/lib/Server/Reports/reports/templatetags/syntax_coloring.py
+++ b/src/lib/Server/Reports/reports/templatetags/syntax_coloring.py
@@ -1,3 +1,4 @@
+import sys
 from django import template
 from django.utils.encoding import smart_unicode, smart_str
 from django.utils.html import conditional_escape
@@ -14,6 +15,12 @@ try:
 except:
     colorize = False
 
+def u_str(string):
+    if sys.hexversion >= 0x03000000:
+        return string
+    else:
+        return unicode(string)
+
 @register.filter
 def syntaxhilight(value, arg="diff", autoescape=None):
     """
@@ -26,9 +33,9 @@ def syntaxhilight(value, arg="diff", autoescape=None):
 
     if colorize:
         try:
-            output = u'<style  type="text/css">' \
+            output = u_str('<style  type="text/css">') \
                 + smart_unicode(HtmlFormatter().get_style_defs('.highlight')) \
-                + u'</style>'
+                + u_str('</style>')
 
             lexer = get_lexer_by_name(arg)
             output += highlight(value, lexer, HtmlFormatter())
@@ -36,6 +43,6 @@ def syntaxhilight(value, arg="diff", autoescape=None):
         except:
             return value
     else:
-        return mark_safe(u'<div class="note-box">Tip: Install pygments for highlighting</div><pre>%s</pre>' % value)
+        return mark_safe(u_str('<div class="note-box">Tip: Install pygments for highlighting</div><pre>%s</pre>') % value)
 syntaxhilight.needs_autoescape = True
 
diff --git a/src/lib/Server/Reports/reports/views.py b/src/lib/Server/Reports/reports/views.py
index 463dec674..ccd71a60e 100644
--- a/src/lib/Server/Reports/reports/views.py
+++ b/src/lib/Server/Reports/reports/views.py
@@ -368,7 +368,8 @@ def render_history_view(request, template='clients/history.html', **kwargs):
                                                         iquery,
                                                         page,
                                                         max_results)
-        except PaginationError, page_error:
+        except PaginationError:
+            page_error = sys.exc_info()[1]
             if isinstance(page_error[0], HttpResponse):
                 return page_error[0]
             return HttpResponseServerError(page_error)