diff options
| author | noah <noah@656d521f-e311-0410-88e0-e7920216d269> | 2003-07-20 19:05:28 +0000 |
|---|---|---|
| committer | noah <noah@656d521f-e311-0410-88e0-e7920216d269> | 2003-07-20 19:05:28 +0000 |
| commit | be9862a7585886ae7f459394f5f838eafe0da969 (patch) | |
| tree | 6adb20fb8adfbf63bedc180af3d33e5a10199f3a | |
| parent | a00f3c1d0a0bfc4898b355c2facfb78ff2400b0f (diff) | |
| download | pexpect-be9862a7585886ae7f459394f5f838eafe0da969.tar.gz | |
fixed cvs merge problem.
git-svn-id: http://pexpect.svn.sourceforge.net/svnroot/pexpect/trunk@205 656d521f-e311-0410-88e0-e7920216d269
| -rw-r--r-- | pexpect/pexpect.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/pexpect/pexpect.py b/pexpect/pexpect.py index ba4da0b..5acd975 100644 --- a/pexpect/pexpect.py +++ b/pexpect/pexpect.py @@ -244,18 +244,8 @@ class spawn: raise ExceptionPexpect ('This file descriptor cannot be closed because it was not created by spawn. The original creator is responsible for closing it.') self.flush() os.close (self.child_fd) -<<<<<<< pexpect.py -<<<<<<< pexpect.py - - pid, status = os.waitpid(self.pid) - -======= - os.waitpid (self.pid, 0) ->>>>>>> 1.79 -======= if wait: os.waitpid (self.pid, 0) ->>>>>>> 1.80 self.child_fd = -1 self.__child_fd_owner = None |