diff --git a/weboob/backends/youporn/pages/base.py b/weboob/backends/youporn/pages/base.py index a0363778..79d4ca15 100644 --- a/weboob/backends/youporn/pages/base.py +++ b/weboob/backends/youporn/pages/base.py @@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. """ import ClientForm +from mechanize import FormNotFoundError from weboob.tools.browser import BasePage class PornPage(BasePage): @@ -27,5 +28,5 @@ class PornPage(BasePage): self.browser.select_form(nr=0) self.browser.submit(name='user_choice') return False - except ClientForm.ControlNotFoundError, e: + except (ClientForm.ControlNotFoundError,FormNotFoundError): return True diff --git a/weboob/backends/youporn/pages/video.py b/weboob/backends/youporn/pages/video.py index 68a7cfcf..c79c12a8 100644 --- a/weboob/backends/youporn/pages/video.py +++ b/weboob/backends/youporn/pages/video.py @@ -29,7 +29,7 @@ class VideoPage(PornPage): URL_REGEXP = re.compile("https?://[w\.]*youporn.com/watch/(\d+)/?.*") def on_loaded(self): - if not PornPage.loaded(self): + if not PornPage.on_loaded(self): return self.video = Video(self.get_id(),