From 3db5056db3334aef08e3a5d67ee12275791f1a3f Mon Sep 17 00:00:00 2001 From: Derek Bankieris Date: Wed, 8 Feb 2017 08:32:23 -0600 Subject: [PATCH] Fix timeout error in VariableServer.fromPID After calculating the remaining timeout, make sure it's still non-negative. Refs #365 --- pymods/trick/variable_server.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pymods/trick/variable_server.py b/pymods/trick/variable_server.py index 1915a83b..7511f3b6 100644 --- a/pymods/trick/variable_server.py +++ b/pymods/trick/variable_server.py @@ -1003,6 +1003,8 @@ def fromPID(pid, timeout=None): while True: if timeout is not None: timeout -= (time.time() - clock) + if timeout < 0: + raise socket.timeout clock = time.time() sock.settimeout(timeout)