summaryrefslogtreecommitdiffstats
path: root/module/plugins/internal/Account.py
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-07-27 10:28:30 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-07-27 10:28:30 +0200
commitf83389333ec10376452aa5f6d5ccd3963c6bafa1 (patch)
treeb63519f3bfcd73b728a27f91c7d786867ea1a917 /module/plugins/internal/Account.py
parentDon't user dictionary’s iterator methods (diff)
downloadpyload-f83389333ec10376452aa5f6d5ccd3963c6bafa1.tar.xz
Update internal plugins
Diffstat (limited to 'module/plugins/internal/Account.py')
-rw-r--r--module/plugins/internal/Account.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/module/plugins/internal/Account.py b/module/plugins/internal/Account.py
index b59a59932..f1a30a9cb 100644
--- a/module/plugins/internal/Account.py
+++ b/module/plugins/internal/Account.py
@@ -14,7 +14,7 @@ from module.utils import compare_time, lock, parseFileSize as parse_size
class Account(Plugin):
__name__ = "Account"
__type__ = "account"
- __version__ = "0.05"
+ __version__ = "0.06"
__status__ = "testing"
__description__ = """Base account plugin"""
@@ -66,7 +66,7 @@ class Account(Plugin):
traceback.print_exc()
else:
- res = True
+ res = info['login']['valid'] = True
finally:
if self.req:
@@ -96,7 +96,7 @@ class Account(Plugin):
@lock
def add(self, user, password=None, options={}):
if user not in self.info:
- self.info[user] = {'login': {'valid': True, 'password': password or "", 'timestamp': 0}, #@NOTE: Do not remove `'valid': True` in 0.4.9 or accounts will not login
+ self.info[user] = {'login': {'valid': None, 'password': password or "", 'timestamp': 0},
'data' : {'options': options, 'timestamp': 0}}
self._login(user)
return True
@@ -171,8 +171,6 @@ class Account(Plugin):
:param reload: reloads cached account information
:return: dictionary with information
"""
- traceback.print_exc() ######################
-
if user not in self.info:
self.log_error(_("User %s not found while retrieving account info") % user)
return
@@ -312,7 +310,7 @@ class Account(Plugin):
def can_use(self):
- return self.select() is not (None, None)
+ return self.select() != (None, None)
def parse_traffic(self, value, unit=None): #: Return kilobytes