From: ping Date: Thu, 17 Sep 2015 16:51:41 +0000 (+0800) Subject: [togglesg] Fixes X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=ed370ff0e6f52aaf3647b32cdbba9d25ce8533e5;p=youtube-dl [togglesg] Fixes --- diff --git a/youtube_dl/extractor/togglesg.py b/youtube_dl/extractor/togglesg.py index 56ef4b464..9f958d453 100644 --- a/youtube_dl/extractor/togglesg.py +++ b/youtube_dl/extractor/togglesg.py @@ -18,7 +18,7 @@ from ..compat import compat_urllib_request class ToggleSgIE(InfoExtractor): IE_NAME = 'togglesg' - _VALID_URL = r'https?://video\.toggle\.sg/(?:(en|zh))/(?:(series|clips|movies))/.+?/(?P[0-9]+)' + _VALID_URL = r'https?://video\.toggle\.sg/(?:en|zh)/(?:series|clips|movies)/.+?/(?P[0-9]+)' _TESTS = [{ 'url': 'http://video.toggle.sg/en/series/lion-moms-tif/trailers/lion-moms-premier/343115', 'info_dict': { @@ -90,9 +90,9 @@ class ToggleSgIE(InfoExtractor): webpage = self._download_webpage(url, video_id, note='Downloading video page') api_user = self._search_regex( - r'apiUser:\s*"([^"]+)"', webpage, 'apiUser', default=self._API_USER, fatal=False) + r'apiUser:\s*"([^"]+)"', webpage, 'apiUser', default=self._API_USER) api_pass = self._search_regex( - r'apiPass:\s*"([^"]+)"', webpage, 'apiPass', default=self._API_PASS, fatal=False) + r'apiPass:\s*"([^"]+)"', webpage, 'apiPass', default=self._API_PASS) params = { 'initObj': {