projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a6620ac
)
Merge branch 'master' of github.com:rg3/youtube-dl
author
Philipp Hagemeister
<phihag@phihag.de>
Sat, 13 Dec 2014 22:05:22 +0000
(23:05 +0100)
committer
Philipp Hagemeister
<phihag@phihag.de>
Sat, 13 Dec 2014 22:05:22 +0000
(23:05 +0100)
test/test_unicode_literals.py
patch
|
blob
|
history
youtube_dl/downloader/f4m.py
patch
|
blob
|
history
youtube_dl/extractor/adultswim.py
patch
|
blob
|
history
youtube_dl/extractor/bbccouk.py
patch
|
blob
|
history
diff --git
a/test/test_unicode_literals.py
b/test/test_unicode_literals.py
index d3cba869bc9382f0fea0c798c36cf2ca168dcc67..19813e034cb533c58a75d1a1be330e6781296657 100644
(file)
--- 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):
class TestUnicodeLiterals(unittest.TestCase):
diff --git
a/youtube_dl/downloader/f4m.py
b/youtube_dl/downloader/f4m.py
index 00f3a026c8497953059426e52a6e16c9b0813186..ef3e0d5f44122621eb9252f93dd1c5471b3fcfee 100644
(file)
--- 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,
'continuedl': True,
'quiet': True,
'noprogress': True,
+ 'ratelimit': self.params.get('ratelimit', None),
'test': self.params.get('test', False),
}
)
'test': self.params.get('test', False),
}
)
diff --git
a/youtube_dl/extractor/adultswim.py
b/youtube_dl/extractor/adultswim.py
index 39e4ca296f97a8fe20e65ab7160f9931fee89a67..502a9c25ad8fd6ab8fed0a46f2f52077f988aad9 100644
(file)
--- 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,
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_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')
formats = []
file_els = idoc.findall('.//files/file')
diff --git
a/youtube_dl/extractor/bbccouk.py
b/youtube_dl/extractor/bbccouk.py
index 01c02d360cd7255b14aa7aa8259de52e44701884..2d2f742aee26062af0c52a30dc5f017290daf51e 100644
(file)
--- 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(
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,
if programme_id:
player = self._download_json(
'http://www.bbc.co.uk/iplayer/episode/%s.json' % group_id,