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

diff --git a/module/plugins/hoster/PornhostCom.py b/module/plugins/hoster/PornhostCom.py
index 61b382c81..f0621c420 100644
--- a/module/plugins/hoster/PornhostCom.py
+++ b/module/plugins/hoster/PornhostCom.py
@@ -1,18 +1,22 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 from module.plugins.Hoster import Hoster
 
 
 class PornhostCom(Hoster):
     __name__ = "PornhostCom"
     __type__ = "hoster"
-    __pattern__ = r'http://(?:www\.)?pornhost\.com/([0-9]+/[0-9]+\.html|[0-9]+)'
     __version__ = "0.2"
+
+    __pattern__ = r'http://(?:www\.)?pornhost\.com/([0-9]+/[0-9]+\.html|[0-9]+)'
+
     __description__ = """Pornhost.com hoster plugin"""
     __author_name__ = "jeix"
     __author_mail__ = "jeix@hasnomail.de"
 
+
     def process(self, pyfile):
         self.download_html()
         if not self.file_exists():
@@ -21,7 +25,7 @@ class PornhostCom(Hoster):
         pyfile.name = self.get_file_name()
         self.download(self.get_file_url())
 
-    ###   old interface
+    # Old interface
     def download_html(self):
         url = self.pyfile.url
         self.html = self.load(url)
@@ -29,32 +33,30 @@ class PornhostCom(Hoster):
     def get_file_url(self):
         """ returns the absolute downloadable filepath
         """
-        if self.html is None:
+        if not self.html:
             self.download_html()
 
-        file_url = re.search(r'download this file</label>.*?<a href="(.*?)"', self.html)
-        if not file_url:
-            file_url = re.search(r'"(http://dl[0-9]+\.pornhost\.com/files/.*?/.*?/.*?/.*?/.*?/.*?\..*?)"', self.html)
-            if not file_url:
-                file_url = re.search(r'width: 894px; height: 675px">.*?<img src="(.*?)"', self.html)
-                if not file_url:
-                    file_url = re.search(r'"http://file[0-9]+\.pornhost\.com/[0-9]+/.*?"',
-                                         self.html)  # TODO: fix this one since it doesn't match
-
-        file_url = file_url.group(1).strip()
+        url = re.search(r'download this file</label>.*?<a href="(.*?)"', self.html)
+        if url is None:
+            url = re.search(r'"(http://dl[0-9]+\.pornhost\.com/files/.*?/.*?/.*?/.*?/.*?/.*?\..*?)"', self.html)
+            if url is None:
+                url = re.search(r'width: 894px; height: 675px">.*?<img src="(.*?)"', self.html)
+                if url is None:
+                    url = re.search(r'"http://file[0-9]+\.pornhost\.com/[0-9]+/.*?"',
+                                    self.html)  # TODO: fix this one since it doesn't match
 
-        return file_url
+        return url.group(1).strip()
 
     def get_file_name(self):
-        if self.html is None:
+        if not self.html:
             self.download_html()
 
         name = re.search(r'<title>pornhost\.com - free file hosting with a twist - gallery(.*?)</title>', self.html)
-        if not name:
+        if name is None:
             name = re.search(r'id="url" value="http://www\.pornhost\.com/(.*?)/"', self.html)
-            if not name:
+            if name is None:
                 name = re.search(r'<title>pornhost\.com - free file hosting with a twist -(.*?)</title>', self.html)
-                if not name:
+                if name is None:
                     name = re.search(r'"http://file[0-9]+\.pornhost\.com/.*?/(.*?)"', self.html)
 
         name = name.group(1).strip() + ".flv"
@@ -64,7 +66,7 @@ class PornhostCom(Hoster):
     def file_exists(self):
         """ returns True or False
         """
-        if self.html is None:
+        if not self.html:
             self.download_html()
 
         if (re.search(r'gallery not found', self.html) is not None or