From b4cef4d45b90093003bbe4524deccadca2849590 Mon Sep 17 00:00:00 2001 From: toke-kogama <48120737+toke-kogama@users.noreply.github.com> Date: Wed, 12 Jun 2019 10:38:28 +0000 Subject: [PATCH 1/2] Update transport.py added compatibility with python 3.7+ --- proxy/transport.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/transport.py b/proxy/transport.py index e47419d..32efd23 100644 --- a/proxy/transport.py +++ b/proxy/transport.py @@ -115,7 +115,7 @@ def data(self): return self.content class HTTPTransport(object): - async = False + asyncronous = False def __init__(self, keep_alive=False, timeout=None): self.keep_alive = keep_alive @@ -156,7 +156,7 @@ def send_sync(self, url, method, data=None, params=None, headers=None, files=Non send = send_sync class ThreadedHTTPTransport(HTTPTransport): - async = True + asyncronous = True def get_worker(self): if not hasattr(self, '_worker'): From 3bce68811a50a41676f4bfe120bf8fca88fec7af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20Fastrup=20Lyngs=C3=B8?= Date: Wed, 19 Jun 2024 00:00:52 +0200 Subject: [PATCH 2/2] Implement support for sending JSON data --- proxy/proxy.py | 4 ++-- proxy/transport.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/proxy/proxy.py b/proxy/proxy.py index 61dcfff..bee2c4a 100644 --- a/proxy/proxy.py +++ b/proxy/proxy.py @@ -116,7 +116,7 @@ def _failed_send(self, e, url): def send_closing(self, *args, **kwargs): return closing(self.send(*args, **kwargs)) - def send(self, endpoint, method="GET", data=None, params=None, headers=None, files=None, success_cb=None, failure_cb=None): + def send(self, endpoint, method="GET", data=None, json=None, params=None, headers=None, files=None, success_cb=None, failure_cb=None): uri = _urlparse.urljoin(self.uri_base, endpoint) if not self._state.should_try(): @@ -136,7 +136,7 @@ def _failed_send(e): if failure_cb: failure_cb() - return self._transport.send(uri, method, data=data, params=params, headers=headers, files=None, success_cb=_success_send, failure_cb=_failed_send) + return self._transport.send(uri, method, data=data, json=json, params=params, headers=headers, files=None, success_cb=_success_send, failure_cb=_failed_send) class RESTProxy(HTTPProxy): def __init__(self, uri, timeout=1.0, keep_alive=False): diff --git a/proxy/transport.py b/proxy/transport.py index 32efd23..492d649 100644 --- a/proxy/transport.py +++ b/proxy/transport.py @@ -128,10 +128,10 @@ def client(self): return self._session return requests - def send_sync(self, url, method, data=None, params=None, headers=None, files=None, success_cb=None, failure_cb=None): + def send_sync(self, url, method, data=None, json=None, params=None, headers=None, files=None, success_cb=None, failure_cb=None): try: httpclient = getattr(self.client(), method.lower()) - rv = httpclient(url, params=params, data=data, headers=headers, files=files, timeout=self.timeout) + rv = httpclient(url, params=params, data=data, json=json, headers=headers, files=files, timeout=self.timeout) rv.raise_for_status() res = Response(rv)