diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-12-13 23:05:22 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-12-13 23:05:22 +0100 |
| commit | da4d4191a9037ef439ef3f93f02935c67dfcee85 (patch) | |
| tree | d8873c14b057478c9591f6e581ce07143209461c | |
| parent | a6620ac28df7ddbe39f09575d8e9f7fe73398a00 (diff) | |
Merge branch 'master' of github.com:rg3/youtube-dl
| -rw-r--r-- | test/test_unicode_literals.py | 2 | ||||
| -rw-r--r-- | youtube_dl/downloader/f4m.py | 1 | ||||
| -rw-r--r-- | youtube_dl/extractor/adultswim.py | 5 | ||||
| -rw-r--r-- | youtube_dl/extractor/bbccouk.py | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/test/test_unicode_literals.py b/test/test_unicode_literals.py index d3cba869b..19813e034 100644 --- a/test/test_unicode_literals.py +++ b/test/test_unicode_literals.py @@ -20,7 +20,7 @@ IGNORED_FILES = [ ] -from helper import assertRegexpMatches +from test.helper import assertRegexpMatches class TestUnicodeLiterals(unittest.TestCase): diff --git a/youtube_dl/downloader/f4m.py b/youtube_dl/downloader/f4m.py index 00f3a026c..ef3e0d5f4 100644 --- a/youtube_dl/downloader/f4m.py +++ b/youtube_dl/downloader/f4m.py @@ -233,6 +233,7 @@ class F4mFD(FileDownloader): 'continuedl': True, 'quiet': True, 'noprogress': True, + 'ratelimit': self.params.get('ratelimit', None), 'test': self.params.get('test', False), } ) diff --git a/youtube_dl/extractor/adultswim.py b/youtube_dl/extractor/adultswim.py index 39e4ca296..502a9c25a 100644 --- a/youtube_dl/extractor/adultswim.py +++ b/youtube_dl/extractor/adultswim.py @@ -7,6 +7,8 @@ import json from .common import InfoExtractor from ..utils import ( ExtractorError, + xpath_text, + float_or_none, ) @@ -128,7 +130,8 @@ class AdultSwimIE(InfoExtractor): segment_url, segment_title, 'Downloading segment information', 'Unable to download segment information') - segment_duration = idoc.find('.//trt').text.strip() + segment_duration = float_or_none( + xpath_text(idoc, './/trt', 'segment duration').strip()) formats = [] file_els = idoc.findall('.//files/file') diff --git a/youtube_dl/extractor/bbccouk.py b/youtube_dl/extractor/bbccouk.py index 01c02d360..2d2f742ae 100644 --- a/youtube_dl/extractor/bbccouk.py +++ b/youtube_dl/extractor/bbccouk.py @@ -209,7 +209,7 @@ class BBCCoUkIE(SubtitlesInfoExtractor): webpage = self._download_webpage(url, group_id, 'Downloading video page') programme_id = self._search_regex( - r'"vpid"\s*:\s*"([\da-z]{8})"', webpage, 'vpid', fatal=False) + r'"vpid"\s*:\s*"([\da-z]{8})"', webpage, 'vpid', fatal=False, default=None) if programme_id: player = self._download_json( 'http://www.bbc.co.uk/iplayer/episode/%s.json' % group_id, |