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, 13 insertions, 9 deletions

diff --git a/module/plugins/hoster/AlldebridCom.py b/module/plugins/hoster/AlldebridCom.py
index 11ee8b7d3..7201f1929 100644
--- a/module/plugins/hoster/AlldebridCom.py
+++ b/module/plugins/hoster/AlldebridCom.py
@@ -1,23 +1,27 @@
 # -*- coding: utf-8 -*-
 
 import re
-from urllib import unquote
+
 from random import randrange
-from module.plugins.Hoster import Hoster
+from urllib import unquote
+
 from module.common.json_layer import json_loads
+from module.plugins.Hoster import Hoster
 from module.utils import parseFileSize
 
 
 class AlldebridCom(Hoster):
     __name__ = "AlldebridCom"
-    __version__ = "0.34"
     __type__ = "hoster"
+    __version__ = "0.34"
 
     __pattern__ = r'https?://(?:[^/]*\.)?alldebrid\..*'
+
     __description__ = """Alldebrid.com hoster plugin"""
     __author_name__ = "Andy Voigt"
     __author_mail__ = "spamsales@online.de"
 
+
     def getFilename(self, url):
         try:
             name = unquote(url.rsplit("/", 1)[1])
@@ -48,17 +52,17 @@ class AlldebridCom(Hoster):
 
             self.logDebug("Json data: %s" % str(data))
 
-            if data["error"]:
-                if data["error"] == "This link isn't available on the hoster website.":
+            if data['error']:
+                if data['error'] == "This link isn't available on the hoster website.":
                     self.offline()
                 else:
-                    self.logWarning(data["error"])
+                    self.logWarning(data['error'])
                     self.tempOffline()
             else:
                 if pyfile.name and not pyfile.name.endswith('.tmp'):
-                    pyfile.name = data["filename"]
-                pyfile.size = parseFileSize(data["filesize"])
-                new_url = data["link"]
+                    pyfile.name = data['filename']
+                pyfile.size = parseFileSize(data['filesize'])
+                new_url = data['link']
 
         if self.getConfig("https"):
             new_url = new_url.replace("http://", "https://")