mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-09-12 00:29:29 -04:00
[compat] Rework compat for method
parameter of compat_urllib_request.Request
constructor
* fixes #32573 * does not break `utils.HEADrequest` (eg)
This commit is contained in:
parent
be008e657d
commit
6651871416
@ -23,6 +23,7 @@ from youtube_dl.compat import (
|
|||||||
compat_urllib_parse_unquote,
|
compat_urllib_parse_unquote,
|
||||||
compat_urllib_parse_unquote_plus,
|
compat_urllib_parse_unquote_plus,
|
||||||
compat_urllib_parse_urlencode,
|
compat_urllib_parse_urlencode,
|
||||||
|
compat_urllib_request,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -135,6 +136,19 @@ class TestCompat(unittest.TestCase):
|
|||||||
self.assertEqual(compat_casefold('\u03a3'), '\u03c3')
|
self.assertEqual(compat_casefold('\u03a3'), '\u03c3')
|
||||||
self.assertEqual(compat_casefold('A\u0345\u03a3'), 'a\u03b9\u03c3')
|
self.assertEqual(compat_casefold('A\u0345\u03a3'), 'a\u03b9\u03c3')
|
||||||
|
|
||||||
|
def test_compat_urllib_request_Request(self):
|
||||||
|
self.assertEqual(
|
||||||
|
compat_urllib_request.Request('http://127.0.0.1', method='PUT').get_method(),
|
||||||
|
'PUT')
|
||||||
|
|
||||||
|
class PUTrequest(compat_urllib_request.Request):
|
||||||
|
def get_method(self):
|
||||||
|
return 'PUT'
|
||||||
|
|
||||||
|
self.assertEqual(
|
||||||
|
PUTrequest('http://127.0.0.1').get_method(),
|
||||||
|
'PUT')
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
unittest.main()
|
unittest.main()
|
||||||
|
@ -58,19 +58,26 @@ except ImportError: # Python 2
|
|||||||
|
|
||||||
# Also fix up lack of method arg in old Pythons
|
# Also fix up lack of method arg in old Pythons
|
||||||
try:
|
try:
|
||||||
_req = compat_urllib_request.Request
|
type(compat_urllib_request.Request('http://127.0.0.1', method='GET'))
|
||||||
_req('http://127.0.0.1', method='GET')
|
|
||||||
except TypeError:
|
except TypeError:
|
||||||
class _request(object):
|
def _add_init_method_arg(cls):
|
||||||
def __new__(cls, url, *args, **kwargs):
|
|
||||||
method = kwargs.pop('method', None)
|
|
||||||
r = _req(url, *args, **kwargs)
|
|
||||||
if method:
|
|
||||||
r.get_method = types.MethodType(lambda _: method, r)
|
|
||||||
return r
|
|
||||||
|
|
||||||
compat_urllib_request.Request = _request
|
init = cls.__init__
|
||||||
|
|
||||||
|
def wrapped_init(self, *args, **kwargs):
|
||||||
|
method = kwargs.pop('method', 'GET')
|
||||||
|
init(self, *args, **kwargs)
|
||||||
|
if any(callable(x.__dict__.get('get_method')) for x in (self.__class__, self) if x != cls):
|
||||||
|
# allow instance or its subclass to override get_method()
|
||||||
|
return
|
||||||
|
if self.has_data() and method == 'GET':
|
||||||
|
method = 'POST'
|
||||||
|
self.get_method = types.MethodType(lambda _: method, self)
|
||||||
|
|
||||||
|
cls.__init__ = wrapped_init
|
||||||
|
|
||||||
|
_add_init_method_arg(compat_urllib_request.Request)
|
||||||
|
del _add_init_method_arg
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import urllib.error as compat_urllib_error
|
import urllib.error as compat_urllib_error
|
||||||
|
Loading…
Reference in New Issue
Block a user