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

diff --git a/module/plugins/hooks/LinkdecrypterCom.py b/module/plugins/hooks/LinkdecrypterCom.py
index dd9cd79f2..1aa8f7ca1 100644
--- a/module/plugins/hooks/LinkdecrypterCom.py
+++ b/module/plugins/hooks/LinkdecrypterCom.py
@@ -1,37 +1,24 @@
 # -*- coding: utf-8 -*-
 
-"""
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License,
-    or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-    See the GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see <http://www.gnu.org/licenses/>.
-
-    @author: zoidberg
-"""
-
 import re
 
-from module.plugins.Hook import Hook
 from module.network.RequestFactory import getURL
+from module.plugins.Hook import Hook
 from module.utils import remove_chars
 
 
 class LinkdecrypterCom(Hook):
     __name__ = "LinkdecrypterCom"
+    __type__ = "hook"
     __version__ = "0.19"
-    __description__ = """Linkdecrypter.com hook plugin"""
+
     __config__ = [("activated", "bool", "Activated", False)]
+
+    __description__ = """Linkdecrypter.com hook plugin"""
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
+
     def coreReady(self):
         try:
             self.loadPatterns()
@@ -41,12 +28,12 @@ class LinkdecrypterCom(Hook):
     def loadPatterns(self):
         page = getURL("http://linkdecrypter.com/")
         m = re.search(r'<b>Supported\(\d+\)</b>: <i>([^+<]*)', page)
-        if not m:
+        if m is None:
             self.logError(_("Crypter list not found"))
             return
 
         builtin = [name.lower() for name in self.core.pluginManager.crypterPlugins.keys()]
-        builtin.extend(["downloadserienjunkiesorg"])
+        builtin.append("downloadserienjunkiesorg")
 
         crypter_pattern = re.compile("(\w[\w.-]+)")
         online = []
@@ -62,7 +49,7 @@ class LinkdecrypterCom(Hook):
         regexp = r"https?://([^.]+\.)*?(%s)/.*" % "|".join(online)
 
         dict = self.core.pluginManager.crypterPlugins[self.__name__]
-        dict["pattern"] = regexp
-        dict["re"] = re.compile(regexp)
+        dict['pattern'] = regexp
+        dict['re'] = re.compile(regexp)
 
         self.logDebug("REGEXP: " + regexp)