diff options
Diffstat (limited to 'module/plugins/internal')
| -rw-r--r-- | module/plugins/internal/Account.py | 15 | ||||
| -rw-r--r-- | module/plugins/internal/MultiHoster.py | 4 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleCrypter.py | 2 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleHoster.py | 6 |
4 files changed, 10 insertions, 17 deletions
diff --git a/module/plugins/internal/Account.py b/module/plugins/internal/Account.py index a402c4ad7..021dedf60 100644 --- a/module/plugins/internal/Account.py +++ b/module/plugins/internal/Account.py @@ -13,7 +13,7 @@ from module.utils import compare_time, lock, parseFileSize as parse_size class Account(Plugin): __name__ = "Account" __type__ = "account" - __version__ = "0.12" + __version__ = "0.13" __status__ = "testing" __description__ = """Base account plugin""" @@ -73,7 +73,7 @@ class Account(Plugin): self.accounts[user]['valid'] = True #@TODO: Remove in 0.4.10 finally: - self.del_request() + self.clean() return res @@ -84,7 +84,7 @@ class Account(Plugin): req = self.get_request(user) if req: req.clearCookies() - self.del_request() + self.clean() if user in self.info: self.info[user]['login'].clear() @@ -254,7 +254,7 @@ class Account(Plugin): traceback.print_exc() finally: - self.del_request() + self.clean() self.info[user].update(info) return info @@ -288,13 +288,6 @@ class Account(Plugin): return self.pyload.requestFactory.getRequest(self.__name__, user) - def del_request(self): - try: - self.req.close() - finally: - self.req = None - - def get_cookies(self, user=None): if not user: user, info = self.select() diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py index cdb668b82..a0ef3ff40 100644 --- a/module/plugins/internal/MultiHoster.py +++ b/module/plugins/internal/MultiHoster.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r class MultiHoster(SimpleHoster): __name__ = "MultiHoster" __type__ = "hoster" - __version__ = "0.49" + __version__ = "0.50" __status__ = "testing" __pattern__ = r'^unmatchable$' @@ -100,7 +100,7 @@ class MultiHoster(SimpleHoster): except Fail, e: #@TODO: Move to PluginThread in 0.4.10 if self.premium: self.log_warning(_("Premium download failed")) - self.restart(reset=True) + self.restart(nopremium=True) elif self.get_config("revertfailed", True) \ and "new_module" in self.pyload.pluginManager.hosterPlugins[self.__name__]: diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py index 084bc133c..f044fbb50 100644 --- a/module/plugins/internal/SimpleCrypter.py +++ b/module/plugins/internal/SimpleCrypter.py @@ -68,7 +68,7 @@ class SimpleCrypter(Crypter, SimpleHoster): if self.account: if not self.user: - self.user, data = self.account.select() + self.user = self.account.select()[0] if not self.user or not self.account.is_logged(self.user, relogin=True): self.account = False diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index a03e301b3..8588fc5c5 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.76" + __version__ = "1.77" __status__ = "testing" __pattern__ = r'^unmatchable$' @@ -210,7 +210,7 @@ class SimpleHoster(Hoster): self.leech_dl = False if not self.get_config('use_premium', True): - self.restart(reset=True) + self.restart(nopremium=True) if self.LOGIN_PREMIUM and not self.premium: self.fail(_("Required premium account not found")) @@ -300,7 +300,7 @@ class SimpleHoster(Hoster): except Fail, e: #@TODO: Move to PluginThread in 0.4.10 if self.get_config('fallback', True) and self.premium: self.log_warning(_("Premium download failed"), e) - self.restart(reset=True) + self.restart(nopremium=True) else: raise Fail(encode(e)) #@TODO: Remove `encode` in 0.4.10 |