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, 9 insertions, 6 deletions

diff --git a/module/plugins/hoster/YoupornCom.py b/module/plugins/hoster/YoupornCom.py
index 9dc1dc6e9..23b9b0a20 100644
--- a/module/plugins/hoster/YoupornCom.py
+++ b/module/plugins/hoster/YoupornCom.py
@@ -1,18 +1,22 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 from module.plugins.Hoster import Hoster
 
 
 class YoupornCom(Hoster):
     __name__ = "YoupornCom"
     __type__ = "hoster"
-    __pattern__ = r'http://(?:www\.)?youporn\.com/watch/.+'
     __version__ = "0.2"
+
+    __pattern__ = r'http://(?:www\.)?youporn\.com/watch/.+'
+
     __description__ = """Youporn.com hoster plugin"""
     __author_name__ = "willnix"
     __author_mail__ = "willnix@pyload.org"
 
+
     def process(self, pyfile):
         self.pyfile = pyfile
 
@@ -29,14 +33,13 @@ class YoupornCom(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'(http://download\.youporn\.com/download/\d+\?save=1)">', self.html).group(1)
-        return file_url
+        return re.search(r'(http://download\.youporn\.com/download/\d+\?save=1)">', self.html).group(1)
 
     def get_file_name(self):
-        if self.html is None:
+        if not self.html:
             self.download_html()
 
         file_name_pattern = r"<title>(.*) - Free Porn Videos - YouPorn</title>"
@@ -45,7 +48,7 @@ class YoupornCom(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"(.*invalid video_id.*)", self.html) is not None:
             return False