From 9f6947133fab41fbfcf4efca99d784187141a74d Mon Sep 17 00:00:00 2001 From: Peter Andreas Entschev Date: Tue, 21 Jan 2025 20:12:45 +0100 Subject: [PATCH] Give precedence to argument over environment variable Co-authored-by: Mads R. B. Kristensen --- ucp/core.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ucp/core.py b/ucp/core.py index 54148451..056d84bc 100644 --- a/ucp/core.py +++ b/ucp/core.py @@ -235,13 +235,10 @@ def __init__( else: self.blocking_progress_mode = True - if "UCXPY_CONNECT_TIMEOUT" in os.environ: - self.connect_timeout = float(os.environ["UCXPY_CONNECT_TIMEOUT"]) - elif connect_timeout is not None: - self.connect_timeout = connect_timeout + if connect_timeout is None: + self.connect_timeout = float(os.get("UCXPY_CONNECT_TIMEOUT", 5)) else: - self.connect_timeout = 5.0 - + self.connect_timeout = connect_timeout if self.blocking_progress_mode: self.epoll_fd = self.worker.init_blocking_progress_mode() weakref.finalize(