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, 17 insertions, 30 deletions

diff --git a/module/plugins/hoster/BezvadataCz.py b/module/plugins/hoster/BezvadataCz.py
index 55f3f33b9..7156db473 100644
--- a/module/plugins/hoster/BezvadataCz.py
+++ b/module/plugins/hoster/BezvadataCz.py
@@ -1,48 +1,35 @@
 # -*- 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 BezvadataCz(SimpleHoster):
     __name__ = "BezvadataCz"
     __type__ = "hoster"
-    __pattern__ = r'http://(?:www\.)?bezvadata.cz/stahnout/.*'
     __version__ = "0.24"
+
+    __pattern__ = r'http://(?:www\.)?bezvadata.cz/stahnout/.*'
+
     __description__ = """BezvaData.cz hoster plugin"""
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
     FILE_NAME_PATTERN = r'<p><b>Soubor: (?P<N>[^<]+)</b></p>'
     FILE_SIZE_PATTERN = r'<li><strong>Velikost:</strong> (?P<S>[^<]+)</li>'
-    FILE_OFFLINE_PATTERN = r'<title>BezvaData \| Soubor nenalezen</title>'
+    OFFLINE_PATTERN = r'<title>BezvaData \| Soubor nenalezen</title>'
+
 
     def setup(self):
         self.multiDL = self.resumeDownload = True
 
     def handleFree(self):
         #download button
-        found = re.search(r'<a class="stahnoutSoubor".*?href="(.*?)"', self.html)
-        if not found:
+        m = re.search(r'<a class="stahnoutSoubor".*?href="(.*?)"', self.html)
+        if m is None:
             self.parseError("page1 URL")
-        url = "http://bezvadata.cz%s" % found.group(1)
+        url = "http://bezvadata.cz%s" % m.group(1)
 
         #captcha form
         self.html = self.load(url)
@@ -52,14 +39,14 @@ class BezvadataCz(SimpleHoster):
             if not inputs:
                 self.parseError("FreeForm")
 
-            found = re.search(r'<img src="data:image/png;base64,(.*?)"', self.html)
-            if not found:
+            m = re.search(r'<img src="data:image/png;base64,(.*?)"', self.html)
+            if m is None:
                 self.parseError("captcha img")
 
             #captcha image is contained in html page as base64encoded data but decryptCaptcha() expects image url
             self.load, proper_load = self.loadcaptcha, self.load
             try:
-                inputs['captcha'] = self.decryptCaptcha(found.group(1), imgtype='png')
+                inputs['captcha'] = self.decryptCaptcha(m.group(1), imgtype='png')
             finally:
                 self.load = proper_load
 
@@ -74,15 +61,15 @@ class BezvadataCz(SimpleHoster):
         #download url
         self.html = self.load("http://bezvadata.cz%s" % action, post=inputs)
         self.checkErrors()
-        found = re.search(r'<a class="stahnoutSoubor2" href="(.*?)">', self.html)
-        if not found:
+        m = re.search(r'<a class="stahnoutSoubor2" href="(.*?)">', self.html)
+        if m is None:
             self.parseError("page2 URL")
-        url = "http://bezvadata.cz%s" % found.group(1)
+        url = "http://bezvadata.cz%s" % m.group(1)
         self.logDebug("DL URL %s" % url)
 
         #countdown
-        found = re.search(r'id="countdown">(\d\d):(\d\d)<', self.html)
-        wait_time = (int(found.group(1)) * 60 + int(found.group(2)) + 1) if found else 120
+        m = re.search(r'id="countdown">(\d\d):(\d\d)<', self.html)
+        wait_time = (int(m.group(1)) * 60 + int(m.group(2)) + 1) if m else 120
         self.wait(wait_time, False)
 
         self.download(url)