diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-08-25 18:36:42 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-08-25 18:36:42 +0200 |
| commit | f971dcbba0671391c0ab3180d02143db28675c9a (patch) | |
| tree | 2f66b44d66b7794c4c944bf0ebaab2fc479a11d4 | |
| parent | 0990305d2acc4c1b7869dae2773c1f24125804bd (diff) | |
| parent | bcc069a937ca51b85e57fee61eff2f45f44816ac (diff) | |
Merge branch 'master' of github.com:rg3/youtube-dl
| -rw-r--r-- | youtube_dl/extractor/bliptv.py | 2 | ||||
| -rw-r--r-- | youtube_dl/extractor/generic.py | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/youtube_dl/extractor/bliptv.py b/youtube_dl/extractor/bliptv.py index 261ead98f..57d17bea3 100644 --- a/youtube_dl/extractor/bliptv.py +++ b/youtube_dl/extractor/bliptv.py @@ -15,7 +15,7 @@ from ..utils import ( class BlipTVIE(SubtitlesInfoExtractor): - _VALID_URL = r'https?://(?:\w+\.)?blip\.tv/(?:(?:.+-|rss/flash/)(?P<id>\d+)|((?:play/|api\.swf#)(?P<lookup_id>[\da-zA-Z+_TESTS]+)))' + _VALID_URL = r'https?://(?:\w+\.)?blip\.tv/(?:(?:.+-|rss/flash/)(?P<id>\d+)|((?:play/|api\.swf#)(?P<lookup_id>[\da-zA-Z+_]+)))' _TESTS = [ { diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 44f7ea3fd..3a908d01f 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -819,7 +819,6 @@ class GenericIE(InfoExtractor): \s*{[^}]+? ["']?clip["']?\s*:\s*\{\s* ["']?url["']?\s*:\s*["']([^"']+)["'] ''', webpage) - assert found if not found: # Try to find twitter cards info found = re.findall(r'<meta (?:property|name)="twitter:player:stream" (?:content|value)="(.+?)"', webpage) |