1.1 --- a/macros/SharedContent.py Mon May 06 16:57:55 2013 +0200
1.2 +++ b/macros/SharedContent.py Mon May 06 17:16:54 2013 +0200
1.3 @@ -2,7 +2,7 @@
1.4 """
1.5 MoinMoin - SharedContent macro, based on the FeedReader macro
1.6
1.7 - @copyright: 2008, 2012 by Paul Boddie <paul@boddie.org.uk>
1.8 + @copyright: 2008, 2012, 2013 by Paul Boddie <paul@boddie.org.uk>
1.9 @license: GNU GPL (v2 or later), see COPYING.txt for details.
1.10 """
1.11
1.12 @@ -54,8 +54,8 @@
1.13 return fmt.text(_("SharedContent: updates could not be retrieved for %s") % feed_url)
1.14
1.15 feed = StringIO(data)
1.16 - _url = feed.readline()
1.17 - _content_type = feed.readline()
1.18 +
1.19 + _url, _content_type, _encoding, _metadata = getCachedResourceMetadata(feed)
1.20
1.21 try:
1.22 # Parse each node from the feed.