youtube-dl

commit f971dcbba0671391c0ab3180d02143db28675c9a
parent 0990305d2acc4c1b7869dae2773c1f24125804bd
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Mon, 25 Aug 2014 18:36:42 +0200

Merge branch 'master' of github.com:rg3/youtube-dl

Diffstat:
M
youtube_dl/extractor/bliptv.py
 | 
2
+-
M
youtube_dl/extractor/generic.py
 | 
1
-

2 files changed, 1 insertion(+), 2 deletions(-)
diff --git 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
@@ -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)