diff options
| author | noah <noah@656d521f-e311-0410-88e0-e7920216d269> | 2004-02-27 21:23:35 +0000 |
|---|---|---|
| committer | noah <noah@656d521f-e311-0410-88e0-e7920216d269> | 2004-02-27 21:23:35 +0000 |
| commit | cbf5d667660f4c72d42c79c47347942800d95201 (patch) | |
| tree | 024f66fff4cfe08cb5e4444015672c295ec7d29c | |
| parent | 005593432390183fe75a2baedf27eec57d4da151 (diff) | |
| download | pexpect-cbf5d667660f4c72d42c79c47347942800d95201.tar.gz | |
Applied patch 844524 Fixed an OSError in pexpect.close * 2003-11-18 16:30 submitted by idadesub (Erick Tryzelaar)
git-svn-id: http://pexpect.svn.sourceforge.net/svnroot/pexpect/trunk@209 656d521f-e311-0410-88e0-e7920216d269
| -rw-r--r-- | pexpect/pexpect.py | 5 | ||||
| -rwxr-xr-x | pexpect/tools/testall.py | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/pexpect/pexpect.py b/pexpect/pexpect.py index 7c97247..4e795ea 100644 --- a/pexpect/pexpect.py +++ b/pexpect/pexpect.py @@ -244,7 +244,10 @@ class spawn: self.flush() os.close (self.child_fd) if wait: - os.waitpid (self.pid, 0) + try: + os.waitpid (self.pid, 0) + except OSError: + pass self.child_fd = -1 self.__child_fd_owner = None diff --git a/pexpect/tools/testall.py b/pexpect/tools/testall.py index 77c83e7..803b507 100755 --- a/pexpect/tools/testall.py +++ b/pexpect/tools/testall.py @@ -14,6 +14,10 @@ import unittest import os, os.path import sys +import pexpect +print pexpect.__version__, +print pexpect.__revision__ + def add_tests_to_list (import_list, dirname, names): # Only check directories named 'tests'. if os.path.basename(dirname) != 'tests': |