# HG changeset patch # User Paul Boddie # Date 1367853414 -7200 # Node ID 54acc965b891e3f274d3c6afad8653b0e7440401 # Parent c5c7dac048e7ab73adb4e09b45be9546b5e6fadd Made cached item retrieval work with contemporary MoinSupport code. diff -r c5c7dac048e7 -r 54acc965b891 macros/SharedContent.py --- a/macros/SharedContent.py Mon May 06 16:57:55 2013 +0200 +++ b/macros/SharedContent.py Mon May 06 17:16:54 2013 +0200 @@ -2,7 +2,7 @@ """ MoinMoin - SharedContent macro, based on the FeedReader macro - @copyright: 2008, 2012 by Paul Boddie + @copyright: 2008, 2012, 2013 by Paul Boddie @license: GNU GPL (v2 or later), see COPYING.txt for details. """ @@ -54,8 +54,8 @@ return fmt.text(_("SharedContent: updates could not be retrieved for %s") % feed_url) feed = StringIO(data) - _url = feed.readline() - _content_type = feed.readline() + + _url, _content_type, _encoding, _metadata = getCachedResourceMetadata(feed) try: # Parse each node from the feed.