From 6bf0a5cb5034a7e684dcc3500e841785237ce2dd Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 19:32:43 +0200 Subject: Adding upstream version 1:115.7.0. Signed-off-by: Daniel Baumann --- testing/condprofile/condprof/patch.py | 47 +++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 testing/condprofile/condprof/patch.py (limited to 'testing/condprofile/condprof/patch.py') diff --git a/testing/condprofile/condprof/patch.py b/testing/condprofile/condprof/patch.py new file mode 100644 index 0000000000..35e4c978b5 --- /dev/null +++ b/testing/condprofile/condprof/patch.py @@ -0,0 +1,47 @@ +# flake8: noqa +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# patch for https://bugzilla.mozilla.org/show_bug.cgi?id=1655869 +# see https://github.com/HDE/arsenic/issues/85 +from arsenic.connection import * + + +@ensure_task +async def request(self, *, url: str, method: str, data=None) -> Tuple[int, Any]: + if data is None: + data = {} + if method not in {"POST", "PUT"}: + data = None + headers = {} + else: + headers = {"Content-Type": "application/json"} + body = json.dumps(data) if data is not None else None + full_url = self.prefix + url + log.info( + "request", url=strip_auth(full_url), method=method, body=body, headers=headers + ) + + async with self.session.request( + url=full_url, method=method, data=body, headers=headers + ) as response: + response_body = await response.read() + try: + data = json.loads(response_body) + except JSONDecodeError as exc: + log.error("json-decode", body=response_body) + data = {"error": "!internal", "message": str(exc), "stacktrace": ""} + wrap_screen(data) + log.info( + "response", + url=strip_auth(full_url), + method=method, + body=body, + response=response, + data=data, + ) + return response.status, data + + +Connection.request = request -- cgit v1.2.3