Pass kwargs to getCache

This commit is contained in:
Ruud committed 2012-05-03 00:18:52 +02:00
1 parent 7d4c2e7d04
commit 7f5bf57055
2 files changed
+3 -3

No files matched your search

+2 -2
View File
@@ -198,7 +198,7 @@ class Plugin(object):
log.error("Something went wrong when finishing the plugin function. Could not find the 'is_running' key") log.error("Something went wrong when finishing the plugin function. Could not find the 'is_running' key")
def getCache(self, cache_key, url = None, *args, **kwargs): def getCache(self, cache_key, url = None, **kwargs):
cache = Env.get('cache').get(cache_key) cache = Env.get('cache').get(cache_key)
if cache: if cache:
if not Env.get('dev'): log.debug('Getting cache %s' % cache_key) if not Env.get('dev'): log.debug('Getting cache %s' % cache_key)
@@ -212,7 +212,7 @@ class Plugin(object):
cache_timeout = kwargs.get('cache_timeout') cache_timeout = kwargs.get('cache_timeout')
del kwargs['cache_timeout'] del kwargs['cache_timeout']
data = self.urlopen(url, *args, **kwargs) data = self.urlopen(url, **kwargs)
self.setCache(cache_key, data, timeout = cache_timeout) self.setCache(cache_key, data, timeout = cache_timeout)
return data return data
except: except:
@@ -31,7 +31,7 @@ class IMDBAPI(MovieProvider):
return [] return []
cache_key = 'imdbapi.cache.%s' % q cache_key = 'imdbapi.cache.%s' % q
cached = self.getCache(cache_key, self.urls['search'] % tryUrlencode({'t': name_year.get('name'), 'y': name_year.get('year', '')}), url_timeout = 3) cached = self.getCache(cache_key, self.urls['search'] % tryUrlencode({'t': name_year.get('name'), 'y': name_year.get('year', '')}), timeout = 3)
if cached: if cached:
result = self.parseMovie(cached) result = self.parseMovie(cached)