diff options
| author | Sergey M․ <dstftw@gmail.com> | 2017-06-10 23:55:05 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2017-06-10 23:56:20 +0700 |
| commit | 4e3637034cf2b3630e6f9c6d34aa0177a8c83950 (patch) | |
| tree | d3f3f72b389f8ba67525b213664791c1aca44e63 /youtube_dl/extractor/generic.py | |
| parent | 1afd0b0da70b6ed709c610aff98786d71511a629 (diff) | |
| download | youtube-dl-4e3637034cf2b3630e6f9c6d34aa0177a8c83950.zip youtube-dl-4e3637034cf2b3630e6f9c6d34aa0177a8c83950.tar.gz youtube-dl-4e3637034cf2b3630e6f9c6d34aa0177a8c83950.tar.bz2 | |
[extractor/generic] Ensure format id is unicode string
Diffstat (limited to 'youtube_dl/extractor/generic.py')
| -rw-r--r-- | youtube_dl/extractor/generic.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index c108d4a..8ef1a29 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -10,6 +10,7 @@ from .common import InfoExtractor from .youtube import YoutubeIE from ..compat import ( compat_etree_fromstring, + compat_str, compat_urllib_parse_unquote, compat_urlparse, compat_xml_parse_error, @@ -1907,14 +1908,14 @@ class GenericIE(InfoExtractor): content_type = head_response.headers.get('Content-Type', '').lower() m = re.match(r'^(?P<type>audio|video|application(?=/(?:ogg$|(?:vnd\.apple\.|x-)?mpegurl)))/(?P<format_id>[^;\s]+)', content_type) if m: - format_id = m.group('format_id') + format_id = compat_str(m.group('format_id')) if format_id.endswith('mpegurl'): formats = self._extract_m3u8_formats(url, video_id, 'mp4') elif format_id == 'f4m': formats = self._extract_f4m_formats(url, video_id) else: formats = [{ - 'format_id': m.group('format_id'), + 'format_id': format_id, 'url': url, 'vcodec': 'none' if m.group('type') == 'audio' else None }] |