feedgen/feed.py

@@ -121,9 +121,14 @@ class FeedGenerator(object):
             if not a.get('name'):
                 continue
             author = xml_elem('author', feed)
-            for k in a.keys():
-                e = xml_elem(k, author)
-                e.text = str(a.get(k))
+            name = xml_elem('name', author)
+            name.text = a.get('name')
+            if a.get('email'):
+                email = xml_elem('email', author)
+                email.text = a.get('email')
+            if a.get('uri'):
+                uri = xml_elem('uri', author)
+                uri.text = a.get('uri')
 
         for l in self.__atom_link or []:
             link = xml_elem('link', feed, href=l['href'])
@@ -525,7 +530,9 @@ class FeedGenerator(object):
         if author is not None:
             if replace or self.__atom_author is None:
                 self.__atom_author = []
-            self.__atom_author += [author]
+            self.__atom_author += ensure_format(author,
+                                                set(['name', 'email', 'uri']),
+                                                set(['name']))
             self.__rss_author = []
             for a in self.__atom_author:
                 if a.get('email'):