From 2dd4e8b9b9324b1e7120b850bdf8c218c8f4081d Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Sat, 27 Oct 2012 12:59:41 +0200 Subject: [PATCH] fix login on youtube (closes #918) --- modules/youtube/browser.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/youtube/browser.py b/modules/youtube/browser.py index e298f3c4..5f41664a 100644 --- a/modules/youtube/browser.py +++ b/modules/youtube/browser.py @@ -36,8 +36,8 @@ class YoutubeBrowser(BaseBrowser): r'https?://.*youtube\.com/index\?ytsession=.+': ForbiddenVideoPage, r'https?://.*youtube\.com/verify_age\?next_url=(?P.+)': VerifyAgePage, r'https?://.*youtube\.com/verify_controversy\?next_url(?P.+)': VerifyControversyPage, - r'https?://accounts\.youtube\.com/accounts/SetSID.*': LoginRedirectPage, - r'https?://www.google.com/accounts/ServiceLogin.*': LoginPage, + r'https?://accounts.google.com/ServiceLogin.*': LoginPage, + r'https?://accounts.google.fr/accounts/SetSID.*': LoginRedirectPage, } def is_logged(self): @@ -45,11 +45,11 @@ class YoutubeBrowser(BaseBrowser): return logged def login(self): - self.location('https://www.google.com/accounts/ServiceLogin?uilel=3&service=youtube&passive=true&continue=http%3A%2F%2Fwww.youtube.com%2Fsignin%3Faction_handle_signin%3Dtrue%26nomobiletemp%3D1%26hl%3Den_US%26next%3D%252F&hl=en_US<mpl=sso') + self.location('https://accounts.google.com/ServiceLogin?uilel=3&service=youtube&passive=true&continue=http%3A%2F%2Fwww.youtube.com%2Fsignin%3Faction_handle_signin%3Dtrue%26nomobiletemp%3D1%26hl%3Den_US%26next%3D%252F&hl=en_US<mpl=sso') self.page.login(self.username, self.password) def get_video_url(self, player_url): - self.location(player_url) + self.location(player_url + '&has_verified=1') assert self.is_on_page(VideoPage) return self.page.get_video_url()