X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=blobdiff_plain;f=tools%2Fqueue_rss.py;h=fc1ad3deb0f1c57d7bc02d4db6b6b375f474a807;hp=b04816e0c6e91d0132d58197ef57edd00e8427c2;hb=6aa926a257c755fc75b394d9d0a7273faf994a2d;hpb=99bb356672533658344cee1b359ffca72a1a2ccf diff --git a/tools/queue_rss.py b/tools/queue_rss.py index b04816e0..fc1ad3de 100755 --- a/tools/queue_rss.py +++ b/tools/queue_rss.py @@ -103,7 +103,7 @@ def parse_leave_reason(fname): try: f = open(fname) - except IOError, e: + except IOError as e: sys.stderr.write("Can't open %s: %s\n" % (fname, e)) return {} @@ -198,10 +198,6 @@ if __name__ == "__main__": status = Status() current_queue = parse_queuedir(settings.queuedir) - if not current_queue: - sys.stderr.write("Unable to scan queuedir '%s'\n" % settings.queuedir) - parser.print_help() - sys.exit(1) update_feeds(current_queue, status, settings) @@ -214,7 +210,7 @@ if __name__ == "__main__": try: status.feed_in.write_xml(file(feed_in_file, "w+"), "utf-8") status.feed_out.write_xml(file(feed_out_file, "w+"), "utf-8") - except IOError, why: + except IOError as why: sys.stderr.write("Unable to write feeds: %s\n", why) sys.exit(1) @@ -222,7 +218,7 @@ if __name__ == "__main__": try: cPickle.dump(status, open(status_db, "w+")) - except IOError, why: + except IOError as why: sys.stderr.write("Unable to save status: %s\n", why) sys.exit(1)