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, 22 deletions

diff --git a/module/plugins/hooks/UnSkipOnFail.py b/module/plugins/hooks/UnSkipOnFail.py
index af6039ecd..f25c5e2b4 100644
--- a/module/plugins/hooks/UnSkipOnFail.py
+++ b/module/plugins/hooks/UnSkipOnFail.py
@@ -1,35 +1,23 @@
 # -*- 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: hgg
-"""
 from os.path import basename
 
-from module.utils import fs_encode
-from module.plugins.Hook import Hook
 from module.PyFile import PyFile
+from module.plugins.Hook import Hook
+from module.utils import fs_encode
 
 
 class UnSkipOnFail(Hook):
-    __name__ = 'UnSkipOnFail'
-    __version__ = '0.01'
-    __description__ = """When a download fails, restart skipped duplicates"""
+    __name__ = "UnSkipOnFail"
+    __type__ = "hook"
+    __version__ = "0.01"
+
     __config__ = [("activated", "bool", "Activated", True)]
+
+    __description__ = """When a download fails, restart skipped duplicates"""
     __author_name__ = "hagg"
-    __author_mail__ = ""
+    __author_mail__ = None
+
 
     def downloadFailed(self, pyfile):
         pyfile_name = basename(pyfile.name)