projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
021bd01
)
[compat] Add compat_b64decode
author
Sergey M․
<dstftw@gmail.com>
Tue, 23 Jan 2018 14:53:01 +0000
(21:53 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Tue, 23 Jan 2018 14:53:01 +0000
(21:53 +0700)
youtube_dl/compat.py
patch
|
blob
|
history
diff --git
a/youtube_dl/compat.py
b/youtube_dl/compat.py
index 41ca9adf1549677ca0573d9d3f233b84f7e6f49c..646c9d79ccc8826a624c805853d5c02faf63f59d 100644
(file)
--- a/
youtube_dl/compat.py
+++ b/
youtube_dl/compat.py
@@
-1,6
+1,7
@@
# coding: utf-8
from __future__ import unicode_literals
# coding: utf-8
from __future__ import unicode_literals
+import base64
import binascii
import collections
import ctypes
import binascii
import collections
import ctypes
@@
-2908,6
+2909,16
@@
except ImportError: # not 2.6+ or is 3.x
except ImportError:
compat_zip = zip
except ImportError:
compat_zip = zip
+
+if sys.version_info < (3, 3):
+ def compat_b64decode(s, *args, **kwargs):
+ if isinstance(s, compat_str):
+ s = s.encode('ascii')
+ return base64.b64decode(s, *args, **kwargs)
+else:
+ compat_b64decode = base64.b64decode
+
+
if platform.python_implementation() == 'PyPy' and sys.pypy_version_info < (5, 4, 0):
# PyPy2 prior to version 5.4.0 expects byte strings as Windows function
# names, see the original PyPy issue [1] and the youtube-dl one [2].
if platform.python_implementation() == 'PyPy' and sys.pypy_version_info < (5, 4, 0):
# PyPy2 prior to version 5.4.0 expects byte strings as Windows function
# names, see the original PyPy issue [1] and the youtube-dl one [2].
@@
-2930,6
+2941,7
@@
__all__ = [
'compat_HTMLParseError',
'compat_HTMLParser',
'compat_HTTPError',
'compat_HTMLParseError',
'compat_HTMLParser',
'compat_HTTPError',
+ 'compat_b64decode',
'compat_basestring',
'compat_chr',
'compat_cookiejar',
'compat_basestring',
'compat_chr',
'compat_cookiejar',