Merge branch 'bwq-master' into develop

2012-07-03 20:41:27 +02:00
parent 4e10fddf95 ab2436081b
commit 76b89c192e
5 changed files with 118 additions and 114 deletions
@@ -215,7 +215,19 @@ class Plugin(object):
                    cache_timeout = kwargs.get('cache_timeout')
                    del kwargs['cache_timeout']

-                data = self.urlopen(url, **kwargs)
+                opener = None
+                if kwargs.get('opener'):
+                    opener = kwargs.get('opener')
+                    del kwargs['opener']
+                
+                if opener:
+                    log.info('Opening url: %s', url)
+                    f = opener.open(url)
+                    data = f.read()
+                    f.close()
+                else:
+                    data = self.urlopen(url, **kwargs)
+
                if data:
                    self.setCache(cache_key, data, timeout = cache_timeout)
                return data