use python-debian for .changes parsing

[dak.git] / queue_rss.py

diff --git a/queue_rss.py b/queue_rss.py
index 9ca66abbe435ad9654c64a37477bc029bdf10f2e..c312b25b64d9c67c438ab000c5a9a887df2aa3ff 100755 (executable)
--- a/queue_rss.py
+++ b/queue_rss.py
@@ -15,6 +15,8 @@ from optparse import OptionParser
 
 import PyRSS2Gen
 
+from debian_bundle.deb822 import Changes
+
 inrss_filename = "changes_in.rss"
 outrss_filename = "changes_out.rss"
 db_filename = "status.db"
@@ -48,7 +50,7 @@ class Status:
 def utf2ascii(src):
     """ Return an ASCII encoded copy of the input UTF-8 string """
     try:
-        res = unicode(src, 'utf-8').encode('ascii', 'replace') 
+        res = unicode(src, 'utf-8').encode('ascii', 'replace')
     except UnicodeDecodeError:
         res = None
     return res
@@ -57,7 +59,7 @@ def purge_old_items(feed, max):
     """ Purge RSSItem from feed, no more than max. """
     if feed.items is None or len(feed.items) == 0:
         return False
-    
+
     feed.items = feed.items[:max]
     return True
 
@@ -66,12 +68,7 @@ def parse_changes(fname):
 
     Return {fname: parsed} """
 
-    p = HeaderParser()
-
-    try:
-        m = p.parse(open(fname), True)
-    except IOError:
-        sys.stderr.write("Unable to parse %s\n" % fname)
+    m = Changes(open(fname))
 
     wanted_fields = set(['Source', 'Version', 'Architecture', 'Distribution',
                          'Date', 'Maintainer', 'Description', 'Changes'])
@@ -115,7 +112,7 @@ def add_rss_item(status, msg, direction):
 
     feed.items.insert(0,
         PyRSS2Gen.RSSItem(
-            title, 
+            title,
             pubDate = msg['Date'],
 #            pubDate = now(),
             description = description,