diff options
| author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2015-03-08 18:25:11 +0100 |
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2015-03-08 18:25:11 +0100 |
| commit | 43d6280d0a03335ec5143383f15e2ca9a49f4046 (patch) | |
| tree | 1ee82177fd8b3f7181c3942bb52e12cb2a8195fa | |
| parent | e5a11a2293069b1acfa5eb5d2694ad4082dd9755 (diff) | |
| download | youtube-dl-43d6280d0a03335ec5143383f15e2ca9a49f4046.tar.gz youtube-dl-43d6280d0a03335ec5143383f15e2ca9a49f4046.tar.xz youtube-dl-43d6280d0a03335ec5143383f15e2ca9a49f4046.zip | |
[downloader/f4m] Fix use of base64 in python 3.2 (fixes #5132)
b64decode needs a byte string, but on 3.4 it also accepts strings.
| -rw-r--r-- | youtube_dl/downloader/f4m.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/downloader/f4m.py b/youtube_dl/downloader/f4m.py index 3dc796faa..4ab000d67 100644 --- a/youtube_dl/downloader/f4m.py +++ b/youtube_dl/downloader/f4m.py @@ -281,7 +281,7 @@ class F4mFD(FileDownloader): boot_info = self._get_bootstrap_from_url(bootstrap_url) else: bootstrap_url = None - bootstrap = base64.b64decode(node.text) + bootstrap = base64.b64decode(node.text.encode('ascii')) boot_info = read_bootstrap_info(bootstrap) return (boot_info, bootstrap_url) @@ -308,7 +308,7 @@ class F4mFD(FileDownloader): live = boot_info['live'] metadata_node = media.find(_add_ns('metadata')) if metadata_node is not None: - metadata = base64.b64decode(metadata_node.text) + metadata = base64.b64decode(metadata_node.text.encode('ascii')) else: metadata = None |