From 082da6e3a6929ca73a7505f0144efda321e8bc81 Mon Sep 17 00:00:00 2001 From: Ruud Date: Fri, 17 Jan 2014 22:38:02 +0100 Subject: [PATCH] Don't return .text in urlopen --- couchpotato/core/plugins/base.py | 4 ++-- couchpotato/core/plugins/file/main.py | 2 +- couchpotato/core/providers/base.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/couchpotato/core/plugins/base.py b/couchpotato/core/plugins/base.py index c7ec517e..b4688e49 100644 --- a/couchpotato/core/plugins/base.py +++ b/couchpotato/core/plugins/base.py @@ -127,7 +127,7 @@ class Plugin(object): return False # http request - def urlopen(self, url, timeout = 30, data = None, headers = None, files = None, show_error = True, return_raw = False): + def urlopen(self, url, timeout = 30, data = None, headers = None, files = None, show_error = True): url = urllib2.quote(ss(url), safe = "%/:=&?~#+!$,;'@()*[]") if not headers: headers = {} @@ -172,7 +172,7 @@ class Plugin(object): log.info('Opening url: %s %s, data: %s', (method, url, [x for x in data.iterkeys()] if isinstance(data, dict) else 'with data')) response = r.request(method, url, verify = False, **kwargs) - data = response.content if return_raw else response.text + data = response.content self.http_failed_request[host] = 0 except (IOError, MaxRetryError, Timeout): diff --git a/couchpotato/core/plugins/file/main.py b/couchpotato/core/plugins/file/main.py index 2d73d0e2..fc63aca8 100644 --- a/couchpotato/core/plugins/file/main.py +++ b/couchpotato/core/plugins/file/main.py @@ -93,7 +93,7 @@ class FileManager(Plugin): return dest try: - filedata = self.urlopen(url, return_raw = True, **urlopen_kwargs) + filedata = self.urlopen(url, **urlopen_kwargs) except: log.error('Failed downloading file %s: %s', (url, traceback.format_exc())) return False diff --git a/couchpotato/core/providers/base.py b/couchpotato/core/providers/base.py index e30cc242..89967df1 100644 --- a/couchpotato/core/providers/base.py +++ b/couchpotato/core/providers/base.py @@ -164,7 +164,7 @@ class YarrProvider(Provider): try: if not self.login(): log.error('Failed downloading from %s', self.getName()) - return self.urlopen(url, return_raw = True) + return self.urlopen(url) except: log.error('Failed downloading from %s: %s', (self.getName(), traceback.format_exc())) @@ -173,7 +173,7 @@ class YarrProvider(Provider): def download(self, url = '', nzb_id = ''): try: - return self.urlopen(url, headers = {'User-Agent': Env.getIdentifier()}, show_error = False, return_raw = True) + return self.urlopen(url, headers = {'User-Agent': Env.getIdentifier()}, show_error = False) except: log.error('Failed getting nzb from %s: %s', (self.getName(), traceback.format_exc()))