Various feeds.py related fixes

morss/feedify.py

@@ -137,7 +137,7 @@ class Builder(object):
         elif self.rule['mode'] == 'json':
             self.doc = json.loads(self.data)
 
-        self.feed = feeds.FeedParserAtom()
+        self.feed = feeds.FeedXML()
 
     def raw(self, html, expr):
         " Returns selected items, thru a stupid query "

morss/morss.py

@@ -552,7 +552,7 @@ def cgi_app(environ, start_response):
     rss = FeedFetch(url, options)
 
     if headers['content-type'] == 'text/xml':
-        headers['content-type'] = rss.mimetype
+        headers['content-type'] = rss.rules['mimetype'][0]
 
     start_response(headers['status'], list(headers.items()))