diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-08-03 23:58:29 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-08-03 23:58:29 +0200 |
| commit | 2fccfd7d93cbd34fff027b8bf6ed6d0ff6c87ce1 (patch) | |
| tree | c97931554842b0c921671b4c7f122f0a3596576b /module/plugins | |
| parent | Merge pull request #1670 from GammaC0de/patch-2 (diff) | |
| parent | Update Plugin.py (diff) | |
| download | pyload-2fccfd7d93cbd34fff027b8bf6ed6d0ff6c87ce1.tar.xz | |
Merge pull request #1685 from GammaC0de/patch-2
Object has no attribute 'COOKIES'
Diffstat (limited to 'module/plugins')
| -rw-r--r-- | module/plugins/internal/Plugin.py | 6 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleHoster.py | 4 | ||||
| -rw-r--r-- | module/plugins/internal/XFSAccount.py | 9 |
3 files changed, 10 insertions, 9 deletions
diff --git a/module/plugins/internal/Plugin.py b/module/plugins/internal/Plugin.py index 99b5751e5..5f70a292d 100644 --- a/module/plugins/internal/Plugin.py +++ b/module/plugins/internal/Plugin.py @@ -146,7 +146,7 @@ def chunks(iterable, size): class Plugin(object): __name__ = "Plugin" __type__ = "hoster" - __version__ = "0.28" + __version__ = "0.29" __status__ = "testing" __pattern__ = r'^unmatchable$' @@ -334,8 +334,8 @@ class Plugin(object): req = self.req or self.pyload.requestFactory.getRequest(self.__name__) #@TODO: Move to network in 0.4.10 - if isinstance(self.COOKIES, list): - set_cookies(req.cj, cookies) + if hasattr(self, 'COOKIES') and isinstance(self.COOKIES, list): + set_cookies(req.cj, self.COOKIES) res = req.load(url, get, post, ref, bool(cookies), just_header, multipart, decode is True) #@TODO: Fix network multipart in 0.4.10 diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index e27f9a231..e2cc21ed8 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -23,7 +23,7 @@ statusMap = dict((v, k) for k, v in _statusMap.items()) class SimpleHoster(Hoster): __name__ = "SimpleHoster" __type__ = "hoster" - __version__ = "1.77" + __version__ = "1.78" __status__ = "testing" __pattern__ = r'^unmatchable$' @@ -221,7 +221,7 @@ class SimpleHoster(Hoster): self.req.setOption("timeout", 120) - if isinstance(self.COOKIES, list): + if hasattr(self, 'COOKIES') and isinstance(self.COOKIES, list): set_cookies(self.req.cj, self.COOKIES) if self.LINK_PATTERN: diff --git a/module/plugins/internal/XFSAccount.py b/module/plugins/internal/XFSAccount.py index efb84de35..7093ccd27 100644 --- a/module/plugins/internal/XFSAccount.py +++ b/module/plugins/internal/XFSAccount.py @@ -143,10 +143,11 @@ class XFSAccount(Account): if not self.HOSTER_URL: self.HOSTER_URL = "http://www.%s/" % self.HOSTER_DOMAIN - if isinstance(self.COOKIES, list): - self.COOKIES.insert((self.HOSTER_DOMAIN, "lang", "english")) - else: - set_cookie(req.cj, self.HOSTER_DOMAIN, "lang", "english") + if hasattr(self, 'COOKIES'): + if isinstance(self.COOKIES, list): + self.COOKIES.insert((self.HOSTER_DOMAIN, "lang", "english")) + else: + set_cookie(req.cj, self.HOSTER_DOMAIN, "lang", "english") if not self.HOSTER_URL: self.login_fail(_("Missing HOSTER_URL")) |