X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fshow_deferred.py;h=4dd603e4bc53f7c8ccfaf750ed0c13f843d84912;hb=13a1194328f9ce5d2e9bdc5405b5e3b2a4ceb845;hp=6307bd384f59b1d1d8ee5bac66ff768733db6878;hpb=d86fdc088f029bb7ebfd7b1e91a178f9efdc6650;p=dak.git diff --git a/dak/show_deferred.py b/dak/show_deferred.py index 6307bd38..4dd603e4 100755 --- a/dak/show_deferred.py +++ b/dak/show_deferred.py @@ -98,7 +98,7 @@ def footer(): height="31" width="88"> """ res += "" - return res + return res.encode('utf-8') def table_header(): return """

Deferred uploads

@@ -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 '

Currently no deferred uploads to Debian

' @@ -242,8 +242,9 @@ def list_uploads(filelist, rrd_dir): Delayed-Until: %s Delay-Remaining: %s"""%(time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(time.time()+u[0])),u[2]) print >> f, fields - print >> f, str(u[5]).rstrip() - open(os.path.join(Cnf["Show-Deferred::LinkPath"],u[1]),"w").write(str(u[5])+fields+'\n') + encoded = unicode(u[5]).encode('utf-8') + print >> f, encoded.rstrip() + open(os.path.join(Cnf["Show-Deferred::LinkPath"],u[1]),"w").write(encoded+fields+'\n') print >> f f.close() os.rename(os.path.join(Cnf["Show-Deferred::LinkPath"],'.status.tmp'),