Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/Account.py
	module/plugins/AccountManager.py
	module/plugins/Hook.py
	module/plugins/OCR.py
	module/plugins/Plugin.py
	module/plugins/PluginManager.py
	module/plugins/ReCaptcha.py
	module/plugins/accounts/Ftp.py
	module/plugins/accounts/Http.py
	module/plugins/internal/MultiHoster.py
	module/plugins/ocr/GigasizeCom.py
	module/plugins/ocr/LinksaveIn.py
	module/plugins/ocr/NetloadIn.py
	module/plugins/ocr/ShareonlineBiz.py

1 files changed, 8 insertions, 6 deletions

diff --git a/module/plugins/accounts/OverLoadMe.py b/module/plugins/accounts/OverLoadMe.py
index eab20480f..34f684cb1 100644
--- a/module/plugins/accounts/OverLoadMe.py
+++ b/module/plugins/accounts/OverLoadMe.py
@@ -6,28 +6,30 @@ from module.common.json_layer import json_loads
 
 class OverLoadMe(Account):
     __name__ = "OverLoadMe"
-    __version__ = "0.01"
     __type__ = "account"
+    __version__ = "0.01"
+
     __description__ = """Over-Load.me account plugin"""
     __author_name__ = "marley"
     __author_mail__ = "marley@over-load.me"
 
+
     def loadAccountInfo(self, user, req):
         data = self.getAccountData(user)
-        page = req.load("https://api.over-load.me/account.php", get={"user": user, "auth": data["password"]}).strip()
+        page = req.load("https://api.over-load.me/account.php", get={"user": user, "auth": data['password']}).strip()
         data = json_loads(page)
 
         # Check for premium
-        if data["membership"] == "Free":
+        if data['membership'] == "Free":
             return {"premium": False}
 
-        account_info = {"validuntil": data["expirationunix"], "trafficleft": -1}
+        account_info = {"validuntil": data['expirationunix'], "trafficleft": -1}
         return account_info
 
     def login(self, user, data, req):
         jsondata = req.load("https://api.over-load.me/account.php",
-                            get={"user": user, "auth": data["password"]}).strip()
+                            get={"user": user, "auth": data['password']}).strip()
         data = json_loads(jsondata)
 
-        if data["err"] == 1:
+        if data['err'] == 1:
             self.wrongPassword()