Skip to content

Commit b4b34e5

Browse files
committed
preen
1 parent 6b2775f commit b4b34e5

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

onvif/client.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -248,24 +248,22 @@ def __init__(
248248
self.dt_diff = dt_diff
249249
self.binding_name = binding_name
250250
# Create soap client
251-
timeout_seconds = _DEFAULT_TIMEOUT
252-
operation_timeout = read_timeout or _READ_TIMEOUT
253251
connector = TCPConnector(
254252
ssl=_NO_VERIFY_SSL_CONTEXT,
255253
keepalive_timeout=KEEPALIVE_EXPIRY,
256254
)
257255
session = ClientSession(
258256
connector=connector,
259257
timeout=aiohttp.ClientTimeout(
260-
total=timeout_seconds,
258+
total=_DEFAULT_TIMEOUT,
261259
connect=_CONNECT_TIMEOUT,
262-
sock_read=operation_timeout,
260+
sock_read=read_timeout or _READ_TIMEOUT,
263261
),
264262
)
265263
self.transport = AsyncTransportProtocolErrorHandler(
266264
session=session,
267-
timeout=timeout_seconds,
268-
operation_timeout=operation_timeout,
265+
timeout=_DEFAULT_TIMEOUT,
266+
operation_timeout=read_timeout or _READ_TIMEOUT,
269267
verify_ssl=False,
270268
)
271269
if not no_cache:

onvif/zeep_aiohttp.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@ def __init__(
5757
self.proxy = proxy
5858
self._close_session = session is None
5959

60+
# Pre-create timeout object to avoid recreating it on each request
61+
effective_timeout = self.operation_timeout or self.timeout
62+
self._client_timeout = (
63+
ClientTimeout(total=effective_timeout) if effective_timeout else None
64+
)
65+
6066
async def __aenter__(self) -> AIOHTTPTransport:
6167
"""Enter async context."""
6268
if self.session is None:

0 commit comments

Comments
 (0)