aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--youtube_dl/extractor/generic.py4
-rw-r--r--youtube_dl/extractor/ustream.py12
2 files changed, 4 insertions, 12 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 6d3e4fb10..238cc7125 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -189,7 +189,9 @@ class GenericIE(InfoExtractor):
'url': 'http://www.american.edu/spa/pti/nsa-privacy-janus-2014.cfm',
'md5': '27b99cdb639c9b12a79bca876a073417',
'info_dict': {
- 'uploader': 'AU SPA: The NSA and Privacy',
+ 'id': '45734260',
+ 'ext': 'flv',
+ 'uploader': 'AU SPA: The NSA and Privacy',
'title': 'NSA and Privacy Forum Debate featuring General Hayden and Barton Gellman'
}
},
diff --git a/youtube_dl/extractor/ustream.py b/youtube_dl/extractor/ustream.py
index d1d2af19b..e4bb3b949 100644
--- a/youtube_dl/extractor/ustream.py
+++ b/youtube_dl/extractor/ustream.py
@@ -13,7 +13,7 @@ from ..utils import (
class UstreamIE(InfoExtractor):
_VALID_URL = r'https?://www\.ustream\.tv/(?P<type>recorded|embed)/(?P<videoID>\d+)'
IE_NAME = 'ustream'
- _TESTS = [{
+ _TEST = {
'url': 'http://www.ustream.tv/recorded/20274954',
'file': '20274954.flv',
'md5': '088f151799e8f572f84eb62f17d73e5c',
@@ -21,17 +21,7 @@ class UstreamIE(InfoExtractor):
"uploader": "Young Americans for Liberty",
"title": "Young Americans for Liberty February 7, 2012 2:28 AM",
},
- },
- {
- 'url': 'http://www.ustream.tv/embed/17357891',
- 'file': 'NSA and Privacy Forum Debate featuring General Hayden and Barton Gellman-45734260.flv',
- 'md5': '27b99cdb639c9b12a79bca876a073417',
- 'info_dict': {
- "uploader": "AU SPA: The NSA and Privacy",
- "title": "NSA and Privacy Forum Debate featuring General Hayden and Barton Gellman"
- },
}
- ]
def _real_extract(self, url):
m = re.match(self._VALID_URL, url)