From be9862a7585886ae7f459394f5f838eafe0da969 Mon Sep 17 00:00:00 2001 From: noah Date: Sun, 20 Jul 2003 19:05:28 +0000 Subject: fixed cvs merge problem. git-svn-id: http://pexpect.svn.sourceforge.net/svnroot/pexpect/trunk@205 656d521f-e311-0410-88e0-e7920216d269 --- pexpect/pexpect.py | 10 ---------- 1 file changed, 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 -- cgit v1.2.1