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

diff --git a/module/plugins/hoster/EdiskCz.py b/module/plugins/hoster/EdiskCz.py
index f2d0fa206..449dc0050 100644
--- a/module/plugins/hoster/EdiskCz.py
+++ b/module/plugins/hoster/EdiskCz.py
@@ -1,40 +1,27 @@
 # -*- 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.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
 class EdiskCz(SimpleHoster):
     __name__ = "EdiskCz"
     __type__ = "hoster"
-    __pattern__ = r'http://(?:www\.)?edisk.(cz|sk|eu)/(stahni|sk/stahni|en/download)/.*'
     __version__ = "0.21"
+
+    __pattern__ = r'http://(?:www\.)?edisk.(cz|sk|eu)/(stahni|sk/stahni|en/download)/.*'
+
     __description__ = """Edisk.cz hoster plugin"""
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
-    URL_PATTERN = r'<form name = "formular" action = "([^"]+)" method = "post">'
     FILE_INFO_PATTERN = r'<span class="fl" title="(?P<N>[^"]+)">\s*.*?\((?P<S>[0-9.]*) (?P<U>[kKMG])i?B\)</h1></span>'
+    OFFLINE_PATTERN = r'<h3>This file does not exist due to one of the following:</h3><ul><li>'
+
     ACTION_PATTERN = r'/en/download/(\d+/.*\.html)'
-    DLLINK_PATTERN = r'http://.*edisk.cz.*\.html'
-    FILE_OFFLINE_PATTERN = r'<h3>This file does not exist due to one of the following:</h3><ul><li>'
+    LINK_PATTERN = r'http://.*edisk.cz.*\.html'
+
 
     def setup(self):
         self.multiDL = False
@@ -44,10 +31,10 @@ class EdiskCz(SimpleHoster):
 
         self.logDebug('URL:' + url)
 
-        found = re.search(self.ACTION_PATTERN, url)
-        if found is None:
+        m = re.search(self.ACTION_PATTERN, url)
+        if m is None:
             self.parseError("ACTION")
-        action = found.group(1)
+        action = m.group(1)
 
         self.html = self.load(url, decode=True)
         self.getFileInfo()
@@ -58,7 +45,7 @@ class EdiskCz(SimpleHoster):
             "action": action
         })
 
-        if not re.match(self.DLLINK_PATTERN, url):
+        if not re.match(self.LINK_PATTERN, url):
             self.fail("Unexpected server response")
 
         self.download(url)