summaryrefslogtreecommitdiffstats
path: root/module/plugins/accounts
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-03-14 11:07:54 +0100
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-03-14 11:07:54 +0100
commite65d19ee3a1e435bf2896ed829e5581eeef92dd2 (patch)
treecf5bb073899205a2f00ddeca8df8b9f3944ea835 /module/plugins/accounts
parent[HotFolder] Missing exception (diff)
downloadpyload-e65d19ee3a1e435bf2896ed829e5581eeef92dd2.tar.xz
Import cleanup for datetime and time modules
Diffstat (limited to 'module/plugins/accounts')
-rw-r--r--module/plugins/accounts/AlldebridCom.py7
-rw-r--r--module/plugins/accounts/CatShareNet.py5
-rw-r--r--module/plugins/accounts/CzshareCom.py4
-rw-r--r--module/plugins/accounts/DebridItaliaCom.py5
-rw-r--r--module/plugins/accounts/DepositfilesCom.py5
-rw-r--r--module/plugins/accounts/EuroshareEu.py4
-rw-r--r--module/plugins/accounts/FilefactoryCom.py4
-rw-r--r--module/plugins/accounts/FilejungleCom.py4
-rw-r--r--module/plugins/accounts/FileserveCom.py4
-rw-r--r--module/plugins/accounts/FreakshareCom.py5
-rw-r--r--module/plugins/accounts/FshareVn.py5
-rw-r--r--module/plugins/accounts/Keep2ShareCc.py7
-rw-r--r--module/plugins/accounts/MegaRapidCz.py4
-rw-r--r--module/plugins/accounts/MegasharesCom.py4
-rw-r--r--module/plugins/accounts/MyfastfileCom.py4
-rw-r--r--module/plugins/accounts/NoPremiumPl.py6
-rw-r--r--module/plugins/accounts/NowVideoSx.py7
-rw-r--r--module/plugins/accounts/OneFichierCom.py5
-rw-r--r--module/plugins/accounts/RapideoPl.py6
-rw-r--r--module/plugins/accounts/RapiduNet.py5
-rw-r--r--module/plugins/accounts/SimplydebridCom.py4
-rw-r--r--module/plugins/accounts/SmoozedCom.py4
-rw-r--r--module/plugins/accounts/TurbobitNet.py4
-rw-r--r--module/plugins/accounts/TusfilesNet.py3
-rw-r--r--module/plugins/accounts/UploadedTo.py4
-rw-r--r--module/plugins/accounts/UploadingCom.py9
-rw-r--r--module/plugins/accounts/WebshareCz.py6
-rw-r--r--module/plugins/accounts/ZeveraCom.py4
28 files changed, 63 insertions, 75 deletions
diff --git a/module/plugins/accounts/AlldebridCom.py b/module/plugins/accounts/AlldebridCom.py
index c830f0c09..f9c1f2ca6 100644
--- a/module/plugins/accounts/AlldebridCom.py
+++ b/module/plugins/accounts/AlldebridCom.py
@@ -1,10 +1,9 @@
# -*- coding: utf-8 -*-
import re
+import time
import xml.dom.minidom as dom
-from time import time
-
from BeautifulSoup import BeautifulSoup
from module.plugins.Account import Account
@@ -33,7 +32,7 @@ class AlldebridCom(Account):
p = re.compile('\d+')
exp_data = p.findall(time_text)
- exp_time = time() + int(exp_data[0]) * 24 * 60 * 60 + int(
+ exp_time = 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
@@ -45,7 +44,7 @@ class AlldebridCom(Account):
self.logDebug(html)
xml = dom.parseString(html)
- exp_time = time() + int(xml.getElementsByTagName("date")[0].childNodes[0].nodeValue) * 24 * 60 * 60
+ exp_time = time.time() + int(xml.getElementsByTagName("date")[0].childNodes[0].nodeValue) * 24 * 60 * 60
account_info = {"validuntil": exp_time, "trafficleft": -1}
return account_info
diff --git a/module/plugins/accounts/CatShareNet.py b/module/plugins/accounts/CatShareNet.py
index ec4d706ae..bb42f443f 100644
--- a/module/plugins/accounts/CatShareNet.py
+++ b/module/plugins/accounts/CatShareNet.py
@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*-
import re
-
-from time import mktime, strptime
+import time
from module.plugins.Account import Account
@@ -36,7 +35,7 @@ class CatShareNet(Account):
expiredate = re.search(self.VALID_UNTIL_PATTERN, html).group(1)
self.logDebug("Expire date: " + expiredate)
- validuntil = mktime(strptime(expiredate, "%Y-%m-%d %H:%M:%S"))
+ validuntil = time.mktime(time.strptime(expiredate, "%Y-%m-%d %H:%M:%S"))
except Exception:
pass
diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py
index 202a88e25..300943828 100644
--- a/module/plugins/accounts/CzshareCom.py
+++ b/module/plugins/accounts/CzshareCom.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
-from time import mktime, strptime
import re
+import time
from module.plugins.Account import Account
@@ -30,7 +30,7 @@ class CzshareCom(Account):
try:
m = re.search(self.CREDIT_LEFT_PATTERN, html)
trafficleft = self.parseTraffic(m.group(1).replace(' ', '').replace(',', '.')) + m.group(2)
- validuntil = mktime(strptime(m.group(3), '%d.%m.%y %H:%M'))
+ validuntil = time.mktime(time.strptime(m.group(3), '%d.%m.%y %H:%M'))
except Exception, e:
self.logError(e)
diff --git a/module/plugins/accounts/DebridItaliaCom.py b/module/plugins/accounts/DebridItaliaCom.py
index 50f9aea27..3df99101a 100644
--- a/module/plugins/accounts/DebridItaliaCom.py
+++ b/module/plugins/accounts/DebridItaliaCom.py
@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*-
import re
-
-from time import mktime, strptime
+import time
from module.plugins.Account import Account
@@ -28,7 +27,7 @@ class DebridItaliaCom(Account):
if 'Account premium not activated' not in html:
m = re.search(self.WALID_UNTIL_PATTERN, html)
if m:
- validuntil = mktime(strptime(m.group(1), "%d/%m/%Y %H:%M"))
+ validuntil = time.mktime(time.strptime(m.group(1), "%d/%m/%Y %H:%M"))
info = {"premium": True, "validuntil": validuntil, "trafficleft": -1}
else:
self.logError(_("Unable to retrieve account information"))
diff --git a/module/plugins/accounts/DepositfilesCom.py b/module/plugins/accounts/DepositfilesCom.py
index dfe430276..a0bd6a37c 100644
--- a/module/plugins/accounts/DepositfilesCom.py
+++ b/module/plugins/accounts/DepositfilesCom.py
@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*-
import re
-
-from time import strptime, mktime
+import time
from module.plugins.Account import Account
@@ -23,7 +22,7 @@ class DepositfilesCom(Account):
html = req.load("https://dfiles.eu/de/gold/")
validuntil = re.search(r"Sie haben Gold Zugang bis: <b>(.*?)</b></div>", html).group(1)
- validuntil = mktime(strptime(validuntil, "%Y-%m-%d %H:%M:%S"))
+ validuntil = time.mktime(time.strptime(validuntil, "%Y-%m-%d %H:%M:%S"))
return {"validuntil": validuntil, "trafficleft": -1}
diff --git a/module/plugins/accounts/EuroshareEu.py b/module/plugins/accounts/EuroshareEu.py
index f92a4e821..db4539e2e 100644
--- a/module/plugins/accounts/EuroshareEu.py
+++ b/module/plugins/accounts/EuroshareEu.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
-from time import mktime, strptime
import re
+import time
from module.plugins.Account import Account
@@ -25,7 +25,7 @@ class EuroshareEu(Account):
premium, validuntil = False, -1
else:
premium = True
- validuntil = mktime(strptime(m.group(1), "%d.%m.%Y %H:%M"))
+ validuntil = time.mktime(time.strptime(m.group(1), "%d.%m.%Y %H:%M"))
return {"validuntil": validuntil, "trafficleft": -1, "premium": premium}
diff --git a/module/plugins/accounts/FilefactoryCom.py b/module/plugins/accounts/FilefactoryCom.py
index 426d572db..f07f4895a 100644
--- a/module/plugins/accounts/FilefactoryCom.py
+++ b/module/plugins/accounts/FilefactoryCom.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import re
-from time import mktime, strptime
+import time
from pycurl import REFERER
@@ -29,7 +29,7 @@ class FilefactoryCom(Account):
if m:
premium = True
validuntil = re.sub(self.VALID_UNTIL_PATTERN, '\g<D> \g<M> \g<Y>', m.group(0))
- validuntil = mktime(strptime(validuntil, "%d %b %Y"))
+ validuntil = time.mktime(time.strptime(validuntil, "%d %b %Y"))
else:
premium = False
validuntil = -1
diff --git a/module/plugins/accounts/FilejungleCom.py b/module/plugins/accounts/FilejungleCom.py
index 9f7474207..b92a371a5 100644
--- a/module/plugins/accounts/FilejungleCom.py
+++ b/module/plugins/accounts/FilejungleCom.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import re
-from time import mktime, strptime
+import time
from module.plugins.Account import Account
@@ -28,7 +28,7 @@ class FilejungleCom(Account):
m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
if m:
premium = True
- validuntil = mktime(strptime(m.group(1), "%d %b %Y"))
+ validuntil = time.mktime(time.strptime(m.group(1), "%d %b %Y"))
else:
premium = False
validuntil = -1
diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py
index 1cf2a3a3c..5eb6b844c 100644
--- a/module/plugins/accounts/FileserveCom.py
+++ b/module/plugins/accounts/FileserveCom.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-from time import mktime, strptime
+import time
from module.plugins.Account import Account
from module.common.json_layer import json_loads
@@ -24,7 +24,7 @@ class FileserveCom(Account):
res = json_loads(html)
if res['type'] == "premium":
- validuntil = mktime(strptime(res['expireTime'], "%Y-%m-%d %H:%M:%S"))
+ validuntil = time.mktime(time.strptime(res['expireTime'], "%Y-%m-%d %H:%M:%S"))
return {"trafficleft": res['traffic'], "validuntil": validuntil}
else:
return {"premium": False, "trafficleft": None, "validuntil": None}
diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py
index a1c7b5662..ca3602a2c 100644
--- a/module/plugins/accounts/FreakshareCom.py
+++ b/module/plugins/accounts/FreakshareCom.py
@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*-
import re
-
-from time import strptime, mktime
+import time
from module.plugins.Account import Account
@@ -26,7 +25,7 @@ class FreakshareCom(Account):
try:
m = re.search(r'ltig bis:</td>\s*<td><b>([\d.:-]+)</b></td>', html, re.M)
- validuntil = mktime(strptime(m.group(1).strip(), "%d.%m.%Y - %H:%M"))
+ validuntil = time.mktime(time.strptime(m.group(1).strip(), "%d.%m.%Y - %H:%M"))
except Exception:
pass
diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py
index 66d912958..0c76e2824 100644
--- a/module/plugins/accounts/FshareVn.py
+++ b/module/plugins/accounts/FshareVn.py
@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*-
import re
-
-from time import mktime, strptime
+import time
from module.plugins.Account import Account
@@ -35,7 +34,7 @@ class FshareVn(Account):
m = re.search(self.VALID_UNTIL_PATTERN, html)
if m:
premium = True
- validuntil = mktime(strptime(m.group(1), '%I:%M:%S %p %d-%m-%Y'))
+ validuntil = time.mktime(time.strptime(m.group(1), '%I:%M:%S %p %d-%m-%Y'))
trafficleft = self.getTrafficLeft()
else:
premium = False
diff --git a/module/plugins/accounts/Keep2ShareCc.py b/module/plugins/accounts/Keep2ShareCc.py
index 9f28799a2..d2ba1d237 100644
--- a/module/plugins/accounts/Keep2ShareCc.py
+++ b/module/plugins/accounts/Keep2ShareCc.py
@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*-
import re
-
-from time import gmtime, mktime, strptime
+import time
from module.plugins.Account import Account
@@ -41,13 +40,13 @@ class Keep2ShareCc(Account):
validuntil = -1
else:
try:
- validuntil = mktime(strptime(expiredate, "%Y.%m.%d"))
+ validuntil = time.mktime(time.strptime(expiredate, "%Y.%m.%d"))
except Exception, e:
self.logError(e)
else:
- premium = True if validuntil > mktime(gmtime()) else False
+ premium = True if validuntil > time.mktime(time.gmtime()) else False
m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
if m:
diff --git a/module/plugins/accounts/MegaRapidCz.py b/module/plugins/accounts/MegaRapidCz.py
index b229fe47d..262d5a818 100644
--- a/module/plugins/accounts/MegaRapidCz.py
+++ b/module/plugins/accounts/MegaRapidCz.py
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
import re
+import time
-from time import mktime, strptime
from module.plugins.Account import Account
@@ -34,7 +34,7 @@ class MegaRapidCz(Account):
m = re.search(self.VALID_UNTIL_PATTERN, htmll)
if m:
- validuntil = mktime(strptime(m.group(1), "%d.%m.%Y - %H:%M"))
+ validuntil = time.mktime(time.strptime(m.group(1), "%d.%m.%Y - %H:%M"))
return {"premium": True, "trafficleft": -1, "validuntil": validuntil}
m = re.search(self.TRAFFIC_LEFT_PATTERN, htmll)
diff --git a/module/plugins/accounts/MegasharesCom.py b/module/plugins/accounts/MegasharesCom.py
index 127ebadc8..3d7ddbe46 100644
--- a/module/plugins/accounts/MegasharesCom.py
+++ b/module/plugins/accounts/MegasharesCom.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import re
-from time import mktime, strptime
+import time
from module.plugins.Account import Account
@@ -29,7 +29,7 @@ class MegasharesCom(Account):
try:
timestr = re.search(self.VALID_UNTIL_PATTERN, html).group(1)
self.logDebug(timestr)
- validuntil = mktime(strptime(timestr, "%b %d, %Y"))
+ validuntil = time.mktime(time.strptime(timestr, "%b %d, %Y"))
except Exception, e:
self.logError(e)
diff --git a/module/plugins/accounts/MyfastfileCom.py b/module/plugins/accounts/MyfastfileCom.py
index 4c75b27f0..9a13e2e42 100644
--- a/module/plugins/accounts/MyfastfileCom.py
+++ b/module/plugins/accounts/MyfastfileCom.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-from time import time
+import time
from module.common.json_layer import json_loads
from module.plugins.Account import Account
@@ -18,7 +18,7 @@ class MyfastfileCom(Account):
def loadAccountInfo(self, user, req):
if 'days_left' in self.json_data:
- validuntil = time() + self.json_data['days_left'] * 24 * 60 * 60
+ validuntil = time.time() + self.json_data['days_left'] * 24 * 60 * 60
return {"premium": True, "validuntil": validuntil, "trafficleft": -1}
else:
self.logError(_("Unable to get account information"))
diff --git a/module/plugins/accounts/NoPremiumPl.py b/module/plugins/accounts/NoPremiumPl.py
index a36b114eb..7e3f757d3 100644
--- a/module/plugins/accounts/NoPremiumPl.py
+++ b/module/plugins/accounts/NoPremiumPl.py
@@ -1,10 +1,10 @@
# -*- coding: utf-8 -*-
-from datetime import datetime
+import datetime
import hashlib
+import time
from module.plugins.Account import Account
-from time import mktime
from module.common.json_layer import json_loads as loads
@@ -44,7 +44,7 @@ class NoPremiumPl(Account):
if "expire" in result.keys() and result["expire"]:
premium = True
- valid_untill = mktime(datetime.fromtimestamp(int(result["expire"])).timetuple())
+ valid_untill = time.mktime(datetime.datetime.fromtimestamp(int(result["expire"])).timetuple())
traffic_left = result["balance"] * 1024
return ({
diff --git a/module/plugins/accounts/NowVideoSx.py b/module/plugins/accounts/NowVideoSx.py
index f44ae3865..2f7b033bd 100644
--- a/module/plugins/accounts/NowVideoSx.py
+++ b/module/plugins/accounts/NowVideoSx.py
@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*-
import re
-
-from time import gmtime, mktime, strptime
+import time
from module.plugins.Account import Account
@@ -33,13 +32,13 @@ class NowVideoSx(Account):
self.logDebug("Expire date: " + expiredate)
try:
- validuntil = mktime(strptime(expiredate, "%Y-%b-%d"))
+ validuntil = time.mktime(time.strptime(expiredate, "%Y-%b-%d"))
except Exception, e:
self.logError(e)
else:
- if validuntil > mktime(gmtime()):
+ if validuntil > time.mktime(time.gmtime()):
premium = True
else:
premium = False
diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py
index 1fc8d994d..be4b5e67e 100644
--- a/module/plugins/accounts/OneFichierCom.py
+++ b/module/plugins/accounts/OneFichierCom.py
@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*-
import re
-
-from time import strptime, mktime
+import time
from pycurl import REFERER
@@ -36,7 +35,7 @@ class OneFichierCom(Account):
self.logDebug("Expire date: " + expiredate)
try:
- validuntil = mktime(strptime(expiredate, "%d/%m/%Y"))
+ validuntil = time.mktime(time.strptime(expiredate, "%d/%m/%Y"))
except Exception, e:
self.logError(e)
else:
diff --git a/module/plugins/accounts/RapideoPl.py b/module/plugins/accounts/RapideoPl.py
index 426c680a6..3e9d52fe8 100644
--- a/module/plugins/accounts/RapideoPl.py
+++ b/module/plugins/accounts/RapideoPl.py
@@ -1,10 +1,10 @@
# -*- coding: utf-8 -*-
-from datetime import datetime
+import datetime
import hashlib
+import time
from module.plugins.Account import Account
-from time import mktime
from module.common.json_layer import json_loads as loads
@@ -43,7 +43,7 @@ class RapideoPl(Account):
valid_untill = -1
if "expire" in result.keys() and result["expire"]:
premium = True
- valid_untill = mktime(datetime.fromtimestamp(int(result["expire"])).timetuple())
+ valid_untill = time.mktime(datetime.datetime.fromtimestamp(int(result["expire"])).timetuple())
traffic_left = result["balance"]
diff --git a/module/plugins/accounts/RapiduNet.py b/module/plugins/accounts/RapiduNet.py
index 8da698c57..70f47b673 100644
--- a/module/plugins/accounts/RapiduNet.py
+++ b/module/plugins/accounts/RapiduNet.py
@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*-
import re
-
-from time import time
+import time
from module.plugins.Account import Account
from module.common.json_layer import json_loads
@@ -38,7 +37,7 @@ class RapiduNet(Account):
m = re.search(self.VALID_UNTIL_PATTERN, html)
if m:
- validuntil = time() + (86400 * int(m.group(1)))
+ validuntil = time.time() + (86400 * int(m.group(1)))
m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
if m:
diff --git a/module/plugins/accounts/SimplydebridCom.py b/module/plugins/accounts/SimplydebridCom.py
index 29be2f73d..24108eb0b 100644
--- a/module/plugins/accounts/SimplydebridCom.py
+++ b/module/plugins/accounts/SimplydebridCom.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-from time import mktime, strptime
+import time
from module.plugins.Account import Account
@@ -22,7 +22,7 @@ class SimplydebridCom(Account):
if str(data[0]) != "1":
return {"premium": False}
else:
- return {"trafficleft": -1, "validuntil": mktime(strptime(str(data[2]), "%d/%m/%Y"))}
+ return {"trafficleft": -1, "validuntil": time.mktime(time.strptime(str(data[2]), "%d/%m/%Y"))}
def login(self, user, data, req):
diff --git a/module/plugins/accounts/SmoozedCom.py b/module/plugins/accounts/SmoozedCom.py
index e6c25752b..87efb89b3 100644
--- a/module/plugins/accounts/SmoozedCom.py
+++ b/module/plugins/accounts/SmoozedCom.py
@@ -1,9 +1,9 @@
# -*- coding: utf-8 -*-
import hashlib
+import time
from beaker.crypto.pbkdf2 import PBKDF2
-from time import time
from module.common.json_layer import json_loads
from module.plugins.Account import Account
@@ -36,7 +36,7 @@ class SmoozedCom(Account):
'session' : status["data"]["session_key"],
'hosters' : [hoster["name"] for hoster in status["data"]["hoster"]]}
- if info['validuntil'] < time():
+ if info['validuntil'] < time.time():
info['premium'] = False
else:
info['premium'] = True
diff --git a/module/plugins/accounts/TurbobitNet.py b/module/plugins/accounts/TurbobitNet.py
index a857649eb..010fbc270 100644
--- a/module/plugins/accounts/TurbobitNet.py
+++ b/module/plugins/accounts/TurbobitNet.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import re
-from time import mktime, strptime
+import time
from module.plugins.Account import Account
@@ -22,7 +22,7 @@ class TurbobitNet(Account):
m = re.search(r'<u>Turbo Access</u> to ([\d.]+)', html)
if m:
premium = True
- validuntil = mktime(strptime(m.group(1), "%d.%m.%Y"))
+ validuntil = time.mktime(time.strptime(m.group(1), "%d.%m.%Y"))
else:
premium = False
validuntil = -1
diff --git a/module/plugins/accounts/TusfilesNet.py b/module/plugins/accounts/TusfilesNet.py
index 279dfd00a..d06ba0583 100644
--- a/module/plugins/accounts/TusfilesNet.py
+++ b/module/plugins/accounts/TusfilesNet.py
@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*-
import re
-
-from time import mktime, strptime, gmtime
+import time
from module.plugins.internal.XFSAccount import XFSAccount
diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py
index 4e5c8035b..d1556b6db 100644
--- a/module/plugins/accounts/UploadedTo.py
+++ b/module/plugins/accounts/UploadedTo.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import re
-from time import time
+import time
from module.plugins.Account import Account
@@ -39,7 +39,7 @@ class UploadedTo(Account):
else:
m = re.findall(r'(\d+) (week|day|hour)', expiredate)
if m:
- validuntil = time()
+ validuntil = time.time()
for n, u in m:
validuntil += float(n) * 60 * 60 * {'week': 168, 'day': 24, 'hour': 1}[u]
diff --git a/module/plugins/accounts/UploadingCom.py b/module/plugins/accounts/UploadingCom.py
index c70d2ec11..5d02ff3a3 100644
--- a/module/plugins/accounts/UploadingCom.py
+++ b/module/plugins/accounts/UploadingCom.py
@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*-
import re
-
-from time import time, strptime, mktime
+import time
from module.plugins.Account import Account
from module.plugins.internal.SimpleHoster import set_cookies
@@ -37,13 +36,13 @@ class UploadingCom(Account):
self.logDebug("Expire date: " + expiredate)
try:
- validuntil = mktime(strptime(expiredate, "%b %d, %Y"))
+ validuntil = time.mktime(time.strptime(expiredate, "%b %d, %Y"))
except Exception, e:
self.logError(e)
else:
- if validuntil > mktime(gmtime()):
+ if validuntil > time.mktime(time.gmtime()):
premium = True
else:
premium = False
@@ -59,5 +58,5 @@ class UploadingCom(Account):
("uploading.com", "_lang", "en")]
req.load("http://uploading.com/")
- req.load("http://uploading.com/general/login_form/?JsHttpRequest=%s-xml" % long(time() * 1000),
+ req.load("http://uploading.com/general/login_form/?JsHttpRequest=%s-xml" % long(time.time() * 1000),
post={'email': user, 'password': data['password'], 'remember': "on"})
diff --git a/module/plugins/accounts/WebshareCz.py b/module/plugins/accounts/WebshareCz.py
index f8e3eeb73..3c5f45d34 100644
--- a/module/plugins/accounts/WebshareCz.py
+++ b/module/plugins/accounts/WebshareCz.py
@@ -1,10 +1,10 @@
# -*- coding: utf-8 -*-
import re
+import time
from hashlib import md5, sha1
from passlib.hash import md5_crypt
-from time import mktime, strptime, time
from module.plugins.Account import Account
@@ -34,9 +34,9 @@ class WebshareCz(Account):
expiredate = re.search(self.VALID_UNTIL_PATTERN, html).group(1)
self.logDebug("Expire date: " + expiredate)
- validuntil = mktime(strptime(expiredate, "%Y-%m-%d %H:%M:%S"))
+ validuntil = time.mktime(time.strptime(expiredate, "%Y-%m-%d %H:%M:%S"))
trafficleft = self.parseTraffic(re.search(self.TRAFFIC_LEFT_PATTERN, html).group(1))
- premium = validuntil > time()
+ premium = validuntil > time.time()
return {'validuntil': validuntil, 'trafficleft': -1, 'premium': premium}
diff --git a/module/plugins/accounts/ZeveraCom.py b/module/plugins/accounts/ZeveraCom.py
index d1585111a..9bc6d0487 100644
--- a/module/plugins/accounts/ZeveraCom.py
+++ b/module/plugins/accounts/ZeveraCom.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-from time import mktime, strptime
+import time
from module.plugins.Account import Account
@@ -40,7 +40,7 @@ class ZeveraCom(Account):
api = self.api_response(req)
if "No trafic" not in api and api['endsubscriptiondate'] != "Expired!":
- validuntil = mktime(strptime(api['endsubscriptiondate'], "%Y/%m/%d %H:%M:%S"))
+ validuntil = time.mktime(time.strptime(api['endsubscriptiondate'], "%Y/%m/%d %H:%M:%S"))
trafficleft = float(api['availabletodaytraffic']) * 1024 if api['orondaytrafficlimit'] != '0' else -1
premium = True