import time
from optparse import OptionParser
from datetime import datetime
+from email.utils import parseaddr
import PyRSS2Gen
def __init__(self):
self.feed_in = PyRSS2Gen.RSS2(
title = "Packages entering NEW",
- link = "http://ftp-master.debian.org/new.html",
+ link = "https://ftp-master.debian.org/new.html",
description = "Debian packages entering the NEW queue" )
self.feed_out = PyRSS2Gen.RSS2(
title = "Packages leaving NEW",
- link = "http://ftp-master.debian.org/new.html",
+ link = "https://ftp-master.debian.org/new.html",
description = "Debian packages leaving the NEW queue" )
self.queue = {}
try:
f = open(fname)
- except IOError, e:
+ except IOError as e:
sys.stderr.write("Can't open %s: %s\n" % (fname, e))
return {}
(cgi.escape(msg['Description']),
cgi.escape(msg['Changes']))
- link = "http://ftp-master.debian.org/new/%s_%s.html" % \
+ link = "https://ftp-master.debian.org/new/%s_%s.html" % \
(msg['Source'], msg['Version'])
+ maintainer = parseaddr(msg['Maintainer'])
+ author = "%s (%s)" % (maintainer[1], maintainer[0])
+
feed.items.insert(0,
PyRSS2Gen.RSSItem(
title,
pubDate = pubdate,
description = description,
- author = cgi.escape(msg['Maintainer']),
+ author = cgi.escape(author),
link = link,
guid = link
)
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)
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)
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)