diff options
| author | remitamine <remitamine@gmail.com> | 2016-02-06 14:03:48 +0100 |
|---|---|---|
| committer | remitamine <remitamine@gmail.com> | 2016-02-06 14:03:48 +0100 |
| commit | 91cb6b50652f1ff395b1c38834ce33e99fa1975c (patch) | |
| tree | 057b10fc0f8bb17bb5df620b33ac374513ff3a20 /youtube_dl | |
| parent | 0826a0b555a06e0cc9047a7779c0f55612c8f3a3 (diff) | |
| download | youtube-dl-91cb6b50652f1ff395b1c38834ce33e99fa1975c.tar.xz | |
rename _parse_mpd to _parse_mpd_formats and add default value for mpd namespace
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/common.py | 6 | ||||
| -rw-r--r-- | youtube_dl/extractor/facebook.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 5287fa4f6..271ba3739 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -1343,14 +1343,14 @@ class InfoExtractor(object): mpd, urlh = res mpd_base_url = re.match(r'https?://.+/', urlh.geturl()).group() - return self._parse_mpd( + return self._parse_mpd_formats( compat_etree_fromstring(mpd.encode('utf-8')), mpd_id, mpd_base_url, formats_dict=formats_dict) - def _parse_mpd(self, mpd_doc, mpd_id=None, mpd_base_url='', formats_dict={}): + def _parse_mpd_formats(self, mpd_doc, mpd_id=None, mpd_base_url='', formats_dict={}): if mpd_doc.get('type') == 'dynamic': return [] - namespace = self._search_regex(r'(?i)^{([^}]+)?}MPD$', mpd_doc.tag, 'namespace') + namespace = self._search_regex(r'(?i)^{([^}]+)?}MPD$', mpd_doc.tag, 'namespace', default=None) def _add_ns(path): return self._xpath_ns(path, namespace) diff --git a/youtube_dl/extractor/facebook.py b/youtube_dl/extractor/facebook.py index 9c751178f..ed237f081 100644 --- a/youtube_dl/extractor/facebook.py +++ b/youtube_dl/extractor/facebook.py @@ -215,7 +215,7 @@ class FacebookIE(InfoExtractor): }) dash_manifest = f[0].get('dash_manifest') if dash_manifest: - formats.extend(self._parse_mpd( + formats.extend(self._parse_mpd_formats( compat_etree_fromstring(compat_urllib_parse_unquote_plus(dash_manifest)))) if not formats: raise ExtractorError('Cannot find video formats') |