[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.
This commit is contained in:
Jaime Marquínez Ferrándiz 2015-03-08 18:25:11 +01:00
parent e5a11a2293
commit 43d6280d0a

View File

@ -281,7 +281,7 @@ def _parse_bootstrap_node(self, node, base_url):
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 @@ def real_download(self, filename, info_dict):
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