diff options
| author | Sergey M․ <dstftw@gmail.com> | 2014-04-01 20:17:35 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2014-04-01 20:17:35 +0700 |
| commit | 0479c625a44e414674982383f5fe051893d125b8 (patch) | |
| tree | 0df4835d09f94ef1d5ae61334fac8e207c2c31e6 /youtube_dl | |
| parent | f659951e22430f3f6000a69affef36e78d583ed2 (diff) | |
[brightcove] Encode object_str with utf-8
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/brightcove.py | 2 | ||||
| -rw-r--r-- | youtube_dl/extractor/generic.py | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/youtube_dl/extractor/brightcove.py b/youtube_dl/extractor/brightcove.py index 83eec84d3..339d60ff0 100644 --- a/youtube_dl/extractor/brightcove.py +++ b/youtube_dl/extractor/brightcove.py @@ -87,7 +87,7 @@ class BrightcoveIE(InfoExtractor): object_str = object_str.replace('<--', '<!--') object_str = fix_xml_ampersands(object_str) - object_doc = xml.etree.ElementTree.fromstring(object_str) + object_doc = xml.etree.ElementTree.fromstring(object_str.encode('utf-8')) fv_el = find_xpath_attr(object_doc, './param', 'name', 'flashVars') if fv_el is not None: diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 9f698323c..3ad0e13f9 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -82,6 +82,17 @@ class GenericIE(InfoExtractor): }, 'add_ie': ['Brightcove'], }, + { + 'url': 'http://www.championat.com/video/football/v/87/87499.html', + 'md5': 'fb973ecf6e4a78a67453647444222983', + 'info_dict': { + 'id': '3414141473001', + 'ext': 'mp4', + 'title': 'Видео. Удаление Дзагоева (ЦСКА)', + 'description': 'Онлайн-трансляция матча ЦСКА - "Волга"', + 'uploader': 'Championat', + }, + }, # Direct link to a video { 'url': 'http://media.w3.org/2010/05/sintel/trailer.mp4', |