From 36e60a23497ae05736c24fed2f4ce936fb61f744 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Thu, 8 Jan 2015 23:31:33 +0100
Subject: "New Year" Update: account plugins

---
 module/plugins/accounts/FilejungleCom.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'module/plugins/accounts/FilejungleCom.py')

diff --git a/module/plugins/accounts/FilejungleCom.py b/module/plugins/accounts/FilejungleCom.py
index a3ec7af64..9f7474207 100644
--- a/module/plugins/accounts/FilejungleCom.py
+++ b/module/plugins/accounts/FilejungleCom.py
@@ -9,7 +9,7 @@ from module.plugins.Account import Account
 class FilejungleCom(Account):
     __name__    = "FilejungleCom"
     __type__    = "account"
-    __version__ = "0.11"
+    __version__ = "0.12"
 
     __description__ = """Filejungle.com account plugin"""
     __license__     = "GPLv3"
@@ -37,13 +37,14 @@ class FilejungleCom(Account):
 
 
     def login(self, user, data, req):
-        html = req.load(self.URL + "login.php", post={
-            "loginUserName": user,
-            "loginUserPassword": data['password'],
-            "loginFormSubmit": "Login",
-            "recaptcha_challenge_field": "",
-            "recaptcha_response_field": "",
-            "recaptcha_shortencode_field": ""})
+        html = req.load(self.URL + "login.php",
+                        post={"loginUserName": user,
+                              "loginUserPassword": data['password'],
+                              "loginFormSubmit": "Login",
+                              "recaptcha_challenge_field": "",
+                              "recaptcha_response_field": "",
+                              "recaptcha_shortencode_field": ""},
+                        decode=True)
 
         if re.search(self.LOGIN_FAILED_PATTERN, html):
             self.wrongPassword()
-- 
cgit v1.2.3


From e65d19ee3a1e435bf2896ed829e5581eeef92dd2 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sat, 14 Mar 2015 11:07:54 +0100
Subject: Import cleanup for datetime and time modules

---
 module/plugins/accounts/FilejungleCom.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/accounts/FilejungleCom.py')

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
-- 
cgit v1.2.3