X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fcompat.py;h=46d438846787e9a95ea8631c869f96341d4ccb9c;hb=f58487b392f7943c31e41b200bef8e97822529db;hp=cd46693b34f4746284e74b36af3bddd7ba8155ee;hpb=bf94e38d3d4aeb4edd5fc10ed9f4e905ee179913;p=youtube-dl diff --git a/youtube_dl/compat.py b/youtube_dl/compat.py index cd46693b3..46d438846 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 @@ -299,7 +297,9 @@ else: # Old 2.6 and 2.7 releases require kwargs to be bytes try: - (lambda x: x)(**{'x': 0}) + def _testfunc(x): + pass + _testfunc(**{'x': 0}) except TypeError: def compat_kwargs(kwargs): return dict((bytes(k), v) for k, v in kwargs.items()) @@ -328,22 +328,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 +351,6 @@ __all__ = [ 'compat_urllib_request', 'compat_urlparse', 'compat_urlretrieve', - 'compat_WINFUNCTYPE', 'compat_xml_parse_error', 'shlex_quote', 'subprocess_check_output',