X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=dak%2Fshow_deferred.py;h=e7dded0f92393f846e88fad9f8aeebac4eabe84b;hb=98874cfad12bc5f2ff6294271f7265624494d683;hp=d19426b14ad7afbd49e06cbc8c6a386fab6bb2ae;hpb=3080993e26a0ac2c374d9a043415fd22847a98ec;p=dak.git diff --git a/dak/show_deferred.py b/dak/show_deferred.py index d19426b1..e7dded0f 100755 --- a/dak/show_deferred.py +++ b/dak/show_deferred.py @@ -24,12 +24,7 @@ import sys, os, re, time import apt_pkg import rrdtool -try: - # starting with squeeze - from debian import deb822 -except: - # up to lenny - from debian_bundle import deb822 +from debian import deb822 from daklib.dbconn import * from daklib import utils @@ -173,7 +168,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 @@ -214,7 +209,7 @@ def get_upload_data(changesfn): 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): @@ -224,7 +219,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 '