Merge lp:~stefanor/ibid/feeds-refresh-504016 into lp:~ibid-core/ibid/old-trunk-1.6

[Stefano Rivera]

[Jonathan Hitchcock (vhata)]

You have a conflict in your diff.

review: Needs Fixing

[Stefano Rivera (stefanor)]

> You have a conflict in your diff.

r830

[lp:~stefanor/ibid/feeds-refresh-504016]

830. By Stefano Rivera on 2010-01-06

Merge from trunk

[Michael Gorven (mgorven)]

 review approve
 status approved

review: Approve

=== modified file 'ibid/plugins/feeds.py'
--- ibid/plugins/feeds.py	2009-12-29 15:56:52 +0000
+++ ibid/plugins/feeds.py	2010-01-06 23:22:11 +0000
@@ -72,9 +72,13 @@
         self.time = datetime.utcnow()
         self.update()
 
-    def update(self):
+    def update(self, max_age=None):
+        headers = {}
+        if max_age:
+            headers['Cache-Control'] = 'max-age=%i' % max_age
+
         feedfile = cacheable_download(self.url, "feeds/%s-%i.xml" % (
-                re.sub(r'\W+', '_', self.name), self.identity_id))
+                re.sub(r'\W+', '_', self.name), self.identity_id), headers)
         self.feed = feedparser.parse(feedfile)
         self.entries = self.feed['entries']
 
@@ -280,7 +284,7 @@
                 .filter(Feed.target != None).all()
 
         for feed in feeds:
-            feed.update()
+            feed.update(max_age=self.interval)
             if not feed.entries:
                 log.warning(u'Error polling feed %s', feed.name)
                 continue
 
=== modified file 'ibid/utils/__init__.py'
--- ibid/utils/__init__.py	2010-01-02 18:02:26 +0000
+++ ibid/utils/__init__.py	2010-01-06 23:22:11 +0000
@@ -74,7 +74,7 @@
     exists = os.path.isfile(cachefile)
 
     req = urllib2.Request(url_to_bytestring(url))
-    for name, value in headers:
+    for name, value in headers.iteritems():
         req.add_header(name, value)
     if not req.has_header('user-agent'):
         req.add_header('User-Agent', 'Ibid/' + (ibid_version() or 'dev'))