additional Nonetype timeout accomidation

pexpect · May 25, 2014 · cccf1b3 · cccf1b3
1 parent ef96998
commit cccf1b3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pexpect/__init__.py b/pexpect/__init__.py
@@ -882,8 +882,8 @@ def read_nonblocking(self, size=1, timeout=-1, poll_exit=0.15):
 
         if timeout == -1:
             timeout = self.timeout
-
-        poll_exit = min(poll_exit, timeout)
+        elif timeout is not None:
+            poll_exit = min(poll_exit, timeout)
 
         # Note that some systems such as Solaris do not give an EOF when
         # the child dies. In fact, you can still try to read