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

diff --git a/module/plugins/hoster/SendspaceCom.py b/module/plugins/hoster/SendspaceCom.py
index d6eafac0c..1dac231eb 100644
--- a/module/plugins/hoster/SendspaceCom.py
+++ b/module/plugins/hoster/SendspaceCom.py
@@ -1,60 +1,48 @@
 # -*- 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 SendspaceCom(SimpleHoster):
     __name__ = "SendspaceCom"
     __type__ = "hoster"
-    __pattern__ = r'http://(?:www\.)?sendspace.com/file/.*'
     __version__ = "0.13"
+
+    __pattern__ = r'http://(?:www\.)?sendspace.com/file/.*'
+
     __description__ = """Sendspace.com hoster plugin"""
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
-    DOWNLOAD_URL_PATTERN = r'<a id="download_button" href="([^"]+)"'
     FILE_NAME_PATTERN = r'<h2 class="bgray">\s*<(?:b|strong)>(?P<N>[^<]+)</'
     FILE_SIZE_PATTERN = r'<div class="file_description reverse margin_center">\s*<b>File Size:</b>\s*(?P<S>[0-9.]+)(?P<U>[kKMG])i?B\s*</div>'
-    FILE_OFFLINE_PATTERN = r'<div class="msg error" style="cursor: default">Sorry, the file you requested is not available.</div>'
+    OFFLINE_PATTERN = r'<div class="msg error" style="cursor: default">Sorry, the file you requested is not available.</div>'
+
+    LINK_PATTERN = r'<a id="download_button" href="([^"]+)"'
     CAPTCHA_PATTERN = r'<td><img src="(/captchas/captcha.php?captcha=([^"]+))"></td>'
     USER_CAPTCHA_PATTERN = r'<td><img src="/captchas/captcha.php?user=([^"]+))"></td>'
 
+
     def handleFree(self):
         params = {}
         for _ in xrange(3):
-            found = re.search(self.DOWNLOAD_URL_PATTERN, self.html)
-            if found:
+            m = re.search(self.LINK_PATTERN, self.html)
+            if m:
                 if 'captcha_hash' in params:
                     self.correctCaptcha()
-                download_url = found.group(1)
+                download_url = m.group(1)
                 break
 
-            found = re.search(self.CAPTCHA_PATTERN, self.html)
-            if found:
+            m = re.search(self.CAPTCHA_PATTERN, self.html)
+            if m:
                 if 'captcha_hash' in params:
                     self.invalidCaptcha()
-                captcha_url1 = "http://www.sendspace.com/" + found.group(1)
-                found = re.search(self.USER_CAPTCHA_PATTERN, self.html)
-                captcha_url2 = "http://www.sendspace.com/" + found.group(1)
-                params = {'captcha_hash': found.group(2),
+                captcha_url1 = "http://www.sendspace.com/" + m.group(1)
+                m = re.search(self.USER_CAPTCHA_PATTERN, self.html)
+                captcha_url2 = "http://www.sendspace.com/" + m.group(1)
+                params = {'captcha_hash': m.group(2),
                           'captcha_submit': 'Verify',
                           'captcha_answer': self.decryptCaptcha(captcha_url1) + " " + self.decryptCaptcha(captcha_url2)}
             else: