X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fshow_deferred.py;h=2b6cd71e60a98efcf265e62231b8817dfa2e914b;hb=27e00376e81d1c37ff327ee0d39670b266418869;hp=dce80987bd3d72238c466bb877fbf3e2a7241659;hpb=173b0b8062b4f717c60ab82fb8dd7af3adde2558;p=dak.git

diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index dce80987..2b6cd71e 100755
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -98,7 +98,7 @@ def footer():
      height="31" width="88"></a>
     """
     res += "</body></html>"
-    return res
+    return res.encode('utf-8')
 
 def table_header():
     return """<h1>Deferred uploads</h1>
@@ -173,7 +173,7 @@ RRA:MAX:0.5:288:795
         try:
             rc = rrdtool.create(*create)
             ru = rrdtool.update(*update)
-        except rrdtool.error, e:
+        except rrdtool.error as e:
             print('warning: queue_report: rrdtool error, skipping %s.rrd: %s' % (type, e))
     except NameError:
         pass
@@ -224,7 +224,7 @@ def list_uploads(filelist, rrd_dir):
     print header()
     if uploads:
         print table_header()
-        print ''.join(map(lambda x: table_row(*x[1:5]), uploads))
+        print ''.join(map(lambda x: table_row(*x[1:5]), uploads)).encode('utf-8')
         print table_footer()
     else:
         print '<h1>Currently no deferred uploads to Debian</h1>'