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, 12 insertions, 5 deletions

diff --git a/module/plugins/hoster/FlyFilesNet.py b/module/plugins/hoster/FlyFilesNet.py
index 3e0466a41..2bf9e0caf 100644
--- a/module/plugins/hoster/FlyFilesNet.py
+++ b/module/plugins/hoster/FlyFilesNet.py
@@ -1,24 +1,31 @@
 # -*- coding: utf-8 -*-
 
 import re
-import urllib
 
-from module.plugins.internal.SimpleHoster import SimpleHoster
+from urllib import unquote
+
 from module.network.RequestFactory import getURL
+from module.plugins.internal.SimpleHoster import SimpleHoster
 
 
 class FlyFilesNet(SimpleHoster):
     __name__ = "FlyFilesNet"
-    __version__ = "0.1"
     __type__ = "hoster"
+    __version__ = "0.1"
+
     __pattern__ = r'http://(?:www\.)?flyfiles\.net/.*'
 
+    __description__ = """FlyFiles.net hoster plugin"""
+    __author_name__ = None
+    __author_mail__ = None
+
     SESSION_PATTERN = r'flyfiles\.net/(.*)/.*'
     FILE_NAME_PATTERN = r'flyfiles\.net/.*/(.*)'
 
+
     def process(self, pyfile):
-        pyfile.name = re.search(self.FILE_NAME_PATTERN, pyfile.url).group(1)
-        pyfile.name = urllib.unquote_plus(pyfile.name)
+        name = re.search(self.FILE_NAME_PATTERN, pyfile.url).group(1)
+        pyfile.name = unquote_plus(name)
 
         session = re.search(self.SESSION_PATTERN, pyfile.url).group(1)