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, 19 insertions, 31 deletions

diff --git a/module/plugins/hoster/UptoboxCom.py b/module/plugins/hoster/UptoboxCom.py
index e403425c1..6d86c5559 100644
--- a/module/plugins/hoster/UptoboxCom.py
+++ b/module/plugins/hoster/UptoboxCom.py
@@ -1,22 +1,7 @@
 # -*- coding: utf-8 -*-
-###############################################################################
-#  This program is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-#  You should have received a copy of the GNU Affero General Public License
-#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#  @author: Walter Purcaro
-###############################################################################
 
 import re
+
 from urllib import unquote
 
 from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
@@ -27,8 +12,10 @@ from module.utils import html_unescape
 class UptoboxCom(XFileSharingPro):
     __name__ = "UptoboxCom"
     __type__ = "hoster"
-    __pattern__ = r'https?://(?:www\.)?uptobox\.com/\w+'
     __version__ = "0.09"
+
+    __pattern__ = r'https?://(?:www\.)?uptobox\.com/\w+'
+
     __description__ = """Uptobox.com hoster plugin"""
     __author_name__ = "Walter Purcaro"
     __author_mail__ = "vuolter@gmail.com"
@@ -36,30 +23,31 @@ class UptoboxCom(XFileSharingPro):
     HOSTER_NAME = "uptobox.com"
 
     FILE_INFO_PATTERN = r'"para_title">(?P<N>.+) \((?P<S>[\d\.]+) (?P<U>\w+)\)'
-    FILE_OFFLINE_PATTERN = r'>(File not found|Access Denied|404 Not Found)'
+    OFFLINE_PATTERN = r'>(File not found|Access Denied|404 Not Found)'
     TEMP_OFFLINE_PATTERN = r'>This server is in maintenance mode'
 
     WAIT_PATTERN = r'>(\d+)</span> seconds<'
 
-    DIRECT_LINK_PATTERN = r'"(https?://\w+\.uptobox\.com/d/.*?)"'
+    LINK_PATTERN = r'"(https?://\w+\.uptobox\.com/d/.*?)"'
+
 
     def handleCaptcha(self, inputs):
-        found = re.search(self.SOLVEMEDIA_PATTERN, self.html)
-        if found:
-            captcha_key = found.group(1)
+        m = re.search(self.SOLVEMEDIA_PATTERN, self.html)
+        if m:
+            captcha_key = m.group(1)
             captcha = SolveMedia(self)
             inputs['adcopy_challenge'], inputs['adcopy_response'] = captcha.challenge(captcha_key)
             return 4
         else:
-            found = re.search(self.CAPTCHA_URL_PATTERN, self.html)
-            if found:
-                captcha_url = found.group(1)
+            m = re.search(self.CAPTCHA_URL_PATTERN, self.html)
+            if m:
+                captcha_url = m.group(1)
                 inputs['code'] = self.decryptCaptcha(captcha_url)
                 return 2
             else:
-                found = re.search(self.CAPTCHA_DIV_PATTERN, self.html, re.DOTALL)
-                if found:
-                    captcha_div = found.group(1)
+                m = re.search(self.CAPTCHA_DIV_PATTERN, self.html, re.DOTALL)
+                if m:
+                    captcha_div = m.group(1)
                     self.logDebug(captcha_div)
                     numerals = re.findall(r'<span.*?padding-left\s*:\s*(\d+).*?>(\d)</span>',
                                           html_unescape(captcha_div))
@@ -67,9 +55,9 @@ class UptoboxCom(XFileSharingPro):
                     self.logDebug("CAPTCHA", inputs['code'], numerals)
                     return 3
                 else:
-                    found = re.search(self.RECAPTCHA_URL_PATTERN, self.html)
-                    if found:
-                        recaptcha_key = unquote(found.group(1))
+                    m = re.search(self.RECAPTCHA_URL_PATTERN, self.html)
+                    if m:
+                        recaptcha_key = unquote(m.group(1))
                         self.logDebug("RECAPTCHA KEY: %s" % recaptcha_key)
                         recaptcha = ReCaptcha(self)
                         inputs['recaptcha_challenge_field'], inputs['recaptcha_response_field'] = recaptcha.challenge(