Skip to content

Commit 4c7eec4

Browse files
author
ci.datadog-api-spec
committed
pre-commit fixes
1 parent 3f4adf6 commit 4c7eec4

File tree

1 file changed

+7
-16
lines changed

1 file changed

+7
-16
lines changed

src/datadog_api_client/rest.py

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525

2626
RETRY_AFTER_STATUS_CODES = frozenset([429, 500, 501, 502, 503, 504, 505, 506, 507, 509, 510, 511, 512])
2727
RETRY_ALLOWED_METHODS = frozenset(["GET", "PUT", "DELETE", "POST", "PATCH"])
28-
# apply sane default for calls to datadog API which has 60s timeout
29-
DEFAULT_TIMEOUT = 55
30-
DEFAULT_IDLE_CONN_MS = 55000
3128

3229

3330
class ClientRetry(urllib3.util.Retry):
@@ -143,7 +140,7 @@ def request(
143140
post_params = post_params or {}
144141
headers = headers or {}
145142

146-
timeout = urllib3.Timeout(total=DEFAULT_TIMEOUT)
143+
timeout = None
147144
if request_timeout:
148145
if isinstance(request_timeout, (int, float)):
149146
timeout = urllib3.Timeout(total=request_timeout)
@@ -243,13 +240,7 @@ def __init__(self, configuration):
243240
proxy = None
244241
if configuration.proxy:
245242
proxy = aiosonic.Proxy(configuration.proxy, configuration.proxy_headers)
246-
pool_configs = {
247-
":default": aiosonic.PoolConfig(
248-
max_conn_idle_ms=DEFAULT_IDLE_CONN_MS
249-
)
250-
}
251-
connector = aiosonic.TCPConnector(pool_configs=pool_configs)
252-
self._client = aiosonic.HTTPClient(connector=connector, proxy=proxy, verify_ssl=configuration.verify_ssl)
243+
self._client = aiosonic.HTTPClient(proxy=proxy, verify_ssl=configuration.verify_ssl)
253244
self._configuration = configuration
254245

255246
def close(self):
@@ -299,13 +290,13 @@ async def request(
299290
(connection, read) timeouts.
300291
"""
301292
assert not post_params, "not supported for now"
302-
from aiosonic.timeout import Timeouts # type: ignore
303-
timeout = Timeouts(request_timeout=DEFAULT_TIMEOUT)
304293
if request_timeout is not None:
294+
from aiosonic.timeout import Timeouts # type: ignore
295+
305296
if isinstance(request_timeout, (int, float)):
306-
timeout = Timeouts(request_timeout=request_timeout)
297+
request_timeout = Timeouts(request_timeout=request_timeout)
307298
else:
308-
timeout = Timeouts(sock_connect=request_timeout[0], sock_read=request_timeout[1])
299+
request_timeout = Timeouts(sock_connect=request_timeout[0], sock_read=request_timeout[1])
309300
request_body = None
310301
if (
311302
"Content-Type" not in headers
@@ -326,7 +317,7 @@ async def request(
326317
counter = 0
327318
while True:
328319
response = await self._client.request(
329-
url, method, headers, query_params, request_body, timeouts=timeout
320+
url, method, headers, query_params, request_body, timeouts=request_timeout
330321
)
331322
retry = self._retry(method, response, counter)
332323
if not retry:

0 commit comments

Comments
 (0)