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

diff --git a/module/plugins/hoster/GigapetaCom.py b/module/plugins/hoster/GigapetaCom.py
index 1282c996d..966ac8094 100644
--- a/module/plugins/hoster/GigapetaCom.py
+++ b/module/plugins/hoster/GigapetaCom.py
@@ -1,25 +1,9 @@
 # -*- 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 random import randint
+
 from pycurl import FOLLOWLOCATION
+from random import randint
 
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
@@ -27,16 +11,20 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class GigapetaCom(SimpleHoster):
     __name__ = "GigapetaCom"
     __type__ = "hoster"
-    __pattern__ = r'http://(?:www\.)?gigapeta\.com/dl/\w+'
     __version__ = "0.01"
+
+    __pattern__ = r'http://(?:www\.)?gigapeta\.com/dl/\w+'
+
     __description__ = """GigaPeta.com hoster plugin"""
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
-    SH_COOKIES = [("http://gigapeta.com", "lang", "us")]
     FILE_NAME_PATTERN = r'<img src=".*" alt="file" />-->\s*(?P<N>.*?)\s*</td>'
     FILE_SIZE_PATTERN = r'<th>\s*Size\s*</th>\s*<td>\s*(?P<S>.*?)\s*</td>'
-    FILE_OFFLINE_PATTERN = r'<div id="page_error">'
+    OFFLINE_PATTERN = r'<div id="page_error">'
+
+    SH_COOKIES = [(".gigapeta.com", "lang", "us")]
+
 
     def handleFree(self):
         captcha_key = str(randint(1, 100000000))
@@ -53,9 +41,9 @@ class GigapetaCom(SimpleHoster):
                 "captcha": captcha,
                 "download": "Download"})
 
-            found = re.search(r"Location\s*:\s*(.*)", self.req.http.header, re.I)
-            if found:
-                download_url = found.group(1)
+            m = re.search(r"Location\s*:\s*(.*)", self.req.http.header, re.I)
+            if m:
+                download_url = m.group(1)
                 break
             elif "Entered figures don&#96;t coincide with the picture" in self.html:
                 self.invalidCaptcha()