diff options
author | Philipp Hagemeister <phihag@phihag.de> | 2014-12-12 11:33:55 +0100 |
---|---|---|
committer | Philipp Hagemeister <phihag@phihag.de> | 2014-12-12 11:33:55 +0100 |
commit | e2f89ec7aada2a58ca658a77401762b764adc112 (patch) | |
tree | edb4df8798d700b07c02510b6ceff1b9235a7c2f /youtube_dl/compat.py | |
parent | 62651c556a1c61b5e73a958e2bc5c1c0624213bc (diff) |
Revert "[utils] Work around PyPy stupidity with Windows DLLs (Fixes #4392)"
This reverts commit 16040f46d64bad8dcc5f948288ef469dd787d3d3.
Diffstat (limited to 'youtube_dl/compat.py')
-rw-r--r-- | youtube_dl/compat.py | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/youtube_dl/compat.py b/youtube_dl/compat.py index cd46693b3..f4a85443e 100644 --- a/youtube_dl/compat.py +++ b/youtube_dl/compat.py @@ -1,10 +1,8 @@ from __future__ import unicode_literals -import ctypes import getpass import optparse import os -import platform import re import subprocess import sys @@ -328,22 +326,6 @@ def workaround_optparse_bug9161(): optparse.OptionGroup.add_option = _compat_add_option -if platform.python_implementation() == 'PyPy': - # PyPy expects byte strings as Windows function names - # https://github.com/rg3/youtube-dl/pull/4392 - def compat_WINFUNCTYPE(*args, **kwargs): - real = ctypes.WINFUNCTYPE(*args, **kwargs) - - def resf(tpl, *args, **kwargs): - funcname, dll = tpl - return real((str(funcname), dll), *args, **kwargs) - - return resf -else: - def compat_WINFUNCTYPE(*args, **kwargs): - return ctypes.WINFUNCTYPE(*args, **kwargs) - - __all__ = [ 'compat_HTTPError', 'compat_chr', @@ -367,7 +349,6 @@ __all__ = [ 'compat_urllib_request', 'compat_urlparse', 'compat_urlretrieve', - 'compat_WINFUNCTYPE', 'compat_xml_parse_error', 'shlex_quote', 'subprocess_check_output', |