From f1a6d14bedbadbdb14dc146bee5fba9beb741a61 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 21 Nov 2014 07:46:34 +0100 Subject: [SimpleCrypter][SimpleHoster] Fix info attr init Conflicts: pyload/plugins/internal/SimpleCrypter.py pyload/plugins/internal/SimpleHoster.py --- pyload/plugins/internal/SimpleCrypter.py | 3 +++ pyload/plugins/internal/SimpleHoster.py | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pyload/plugins/internal/SimpleCrypter.py b/pyload/plugins/internal/SimpleCrypter.py index 227c93da6..eb0f8a323 100644 --- a/pyload/plugins/internal/SimpleCrypter.py +++ b/pyload/plugins/internal/SimpleCrypter.py @@ -76,6 +76,9 @@ class SimpleCrypter(Crypter): if self.LOGIN_PREMIUM and not self.premium: self.fail(_("Required premium account not found")) + self.info = {} + self.links = [] + self.req.setOption("timeout", 120) if isinstance(self.COOKIES, list): diff --git a/pyload/plugins/internal/SimpleHoster.py b/pyload/plugins/internal/SimpleHoster.py index 0efcb9c6f..9fd4268dc 100644 --- a/pyload/plugins/internal/SimpleHoster.py +++ b/pyload/plugins/internal/SimpleHoster.py @@ -212,15 +212,14 @@ class SimpleHoster(Hoster): return info - def init(self): - self.link = "" #@TODO: Move to hoster class in 0.4.10 - - def setup(self): self.resumeDownload = self.multiDL = self.premium def prepare(self): + self.info = {} + self.link = "" #@TODO: Move to hoster class in 0.4.10 + if self.CHECK_DIRECT_LINK is None: self.CHECK_DIRECT_LINK = bool(self.account) -- cgit v1.2.3