diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2012-11-28 12:59:55 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2012-11-28 12:59:55 +0100 |
| commit | 3cd69a54b20b690d570e7c7ae5a9bba26f30b897 (patch) | |
| tree | 079af7f06e7380f405d4bfd477a9701ece265a09 /youtube_dl | |
| parent | 627dcfff398b00429c8b310f1c1775f9be6f0268 (diff) | |
| parent | 0eb0faa26fd63d9ad84ba878ee06110628dc942a (diff) | |
Merge branch 'master' of github.com:rg3/youtube-dl
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/InfoExtractors.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index 036132167..925dabc96 100644 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -486,8 +486,8 @@ class YoutubeIE(InfoExtractor): # Extension video_extension = self._video_extensions.get(format_param, 'flv') - video_format = '{} - {}'.format(format_param if format_param else video_extension, - self._video_dimensions.get(format_param, '???')) + video_format = '{0} - {1}'.format(format_param if format_param else video_extension, + self._video_dimensions.get(format_param, '???')) results.append({ 'id': video_id, @@ -2649,6 +2649,7 @@ class EscapistIE(InfoExtractor): class CollegeHumorIE(InfoExtractor): """Information extractor for collegehumor.com""" + _WORKING = False _VALID_URL = r'^(?:https?://)?(?:www\.)?collegehumor\.com/video/(?P<videoid>[0-9]+)/(?P<shorttitle>.*)$' IE_NAME = u'collegehumor' |