Fix timeout bug

ptr-yudai · May 23, 2024 · e116d64 · e116d64
1 parent adcb3e1
commit e116d64
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/ptrlib/connection/tube.py b/ptrlib/connection/tube.py
@@ -72,7 +72,7 @@ def __new__(cls, *args, **kwargs):
     # Constructor
     #
     def __init__(self,
-                 timeout: Optional[Union[int, float]]=None,
+                 timeout: Union[int, float]=0,
                  debug: bool=False):
         """Base constructor
 
@@ -125,8 +125,7 @@ def settimeout(self, timeout: Optional[Union[int, float]]=None):
             "`timeout` must be positive and either int or float"
 
         if timeout is None:
-            if self._default_timeout is not None:
-                self._settimeout_impl(self._default_timeout)
+            self._settimeout_impl(self._default_timeout)
         else:
             self._settimeout_impl(timeout)
 

diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@
 
 setup(
     name='ptrlib',
-    version='2.3.1',
+    version='2.3.2',
     description='CTF library',
     long_description=long_description,
     long_description_content_type='text/markdown',

diff --git a/tests/connection/test_proc.py b/tests/connection/test_proc.py
@@ -111,4 +111,3 @@ def test_timeout(self):
         with self.assertRaises(TimeoutError) as cm:
             p.sendlineafter(b"neko", b, timeout=0.5)
         self.assertEqual(cm.exception.args[1].decode().strip(), a)
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -111,4 +111,3 @@ def test_timeout(self):
		with self.assertRaises(TimeoutError) as cm:
		p.sendlineafter(b"neko", b, timeout=0.5)
		self.assertEqual(cm.exception.args[1].decode().strip(), a)