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, 14 insertions, 10 deletions

diff --git a/module/plugins/hoster/OverLoadMe.py b/module/plugins/hoster/OverLoadMe.py
index aaa1442e4..7b7c83893 100644
--- a/module/plugins/hoster/OverLoadMe.py
+++ b/module/plugins/hoster/OverLoadMe.py
@@ -1,23 +1,27 @@
 # -*- coding: utf-8 -*-
 
 import re
-from urllib import unquote
+
 from random import randrange
+from urllib import unquote
 
-from module.plugins.Hoster import Hoster
 from module.common.json_layer import json_loads
+from module.plugins.Hoster import Hoster
 from module.utils import parseFileSize
 
 
 class OverLoadMe(Hoster):
     __name__ = "OverLoadMe"
-    __version__ = "0.01"
     __type__ = "hoster"
+    __version__ = "0.01"
+
     __pattern__ = r'https?://.*overload\.me.*'
+
     __description__ = """Over-Load.me hoster plugin"""
     __author_name__ = "marley"
     __author_mail__ = "marley@over-load.me"
 
+
     def getFilename(self, url):
         try:
             name = unquote(url.rsplit("/", 1)[1])
@@ -42,19 +46,19 @@ class OverLoadMe(Hoster):
             data = self.account.getAccountData(self.user)
 
             page = self.load("https://api.over-load.me/getdownload.php",
-                             get={"auth": data["password"], "link": pyfile.url})
+                             get={"auth": data['password'], "link": pyfile.url})
             data = json_loads(page)
 
             self.logDebug("Returned Data: %s" % data)
 
-            if data["err"] == 1:
-                self.logWarning(data["msg"])
+            if data['err'] == 1:
+                self.logWarning(data['msg'])
                 self.tempOffline()
             else:
-                if pyfile.name is not None and pyfile.name.endswith('.tmp') and data["filename"]:
-                    pyfile.name = data["filename"]
-                    pyfile.size = parseFileSize(data["filesize"])
-                new_url = data["downloadlink"]
+                if pyfile.name is not None and pyfile.name.endswith('.tmp') and data['filename']:
+                    pyfile.name = data['filename']
+                    pyfile.size = parseFileSize(data['filesize'])
+                new_url = data['downloadlink']
 
         if self.getConfig("https"):
             new_url = new_url.replace("http://", "https://")