height="31" width="88"></a>
"""
res += "</body></html>"
- return res
+ return res.encode('utf-8')
def table_header():
return """<h1>Deferred uploads</h1>
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
os.unlink(lfn)
if os.path.exists(qfn):
os.symlink(qfn,lfn)
- os.chmod(qfn, 0644)
+ os.chmod(qfn, 0o644)
return (max(delaydays-1,0)*24*60*60+remainingtime, changesname, delay, uploader, achanges.get('closes','').split(),achanges, delaydays)
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>'