summaryrefslogtreecommitdiffstats
path: root/pyload/plugins/account
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2014-12-01 23:53:07 +0100
committerGravatar Walter Purcaro <vuolter@gmail.com> 2014-12-01 23:53:07 +0100
commit004a80bfaad38f9400e8aebcb8f980353a232295 (patch)
tree1e786d2d14a3040767aac237982544b74a9567cb /pyload/plugins/account
parentFix previous merge (diff)
downloadpyload-004a80bfaad38f9400e8aebcb8f980353a232295.tar.xz
PEP-8, Python Zen, refactor and reduce code (thx FedeG)
Diffstat (limited to 'pyload/plugins/account')
-rw-r--r--pyload/plugins/account/AlldebridCom.py2
-rw-r--r--pyload/plugins/account/CatShareNet.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/pyload/plugins/account/AlldebridCom.py b/pyload/plugins/account/AlldebridCom.py
index d4770426b..4f9164468 100644
--- a/pyload/plugins/account/AlldebridCom.py
+++ b/pyload/plugins/account/AlldebridCom.py
@@ -34,7 +34,7 @@ class AlldebridCom(Account):
exp_time = time() + int(exp_data[0]) * 24 * 60 * 60 + int(
exp_data[1]) * 60 * 60 + (int(exp_data[2]) - 1) * 60
#Get expiration date from API
- except:
+ except Exception:
data = self.getAccountData(user)
page = req.load("http://www.alldebrid.com/api.php?action=info_user&login=%s&pw=%s" % (user,
data['password']))
diff --git a/pyload/plugins/account/CatShareNet.py b/pyload/plugins/account/CatShareNet.py
index 30a2691da..e172d6aee 100644
--- a/pyload/plugins/account/CatShareNet.py
+++ b/pyload/plugins/account/CatShareNet.py
@@ -31,7 +31,7 @@ class CatShareNet(Account):
m = re.search(self.PREMIUM_PATTERN, html)
if "Premium" in m.group(1):
premium = True
- except:
+ except Exception:
pass
try:
@@ -39,7 +39,7 @@ class CatShareNet(Account):
expiredate = m.group(1)
if "-" not in expiredate:
validuntil = mktime(strptime(expiredate, "%d.%m.%Y"))
- except:
+ except Exception:
pass
return {'premium': premium, 'trafficleft': -1, 'validuntil': validuntil}