diff options
| author | Steven Silvester <steven.silvester@ieee.org> | 2014-12-01 21:27:33 -0600 |
|---|---|---|
| committer | Thomas Kluyver <takowl@gmail.com> | 2015-09-12 11:49:09 +0100 |
| commit | cd9296c1b93bcdd1006cd044110c3e806c322a66 (patch) | |
| tree | 31d31deae221bcdcd44dde250f21e885ced32050 /pexpect/popen_spawn.py | |
| parent | 6407d849d4719c9aeda1eca011808044fb126764 (diff) | |
| download | pexpect-git-cd9296c1b93bcdd1006cd044110c3e806c322a66.tar.gz | |
Fix popen spawn and tests on windows
Cleanup
Always close stdin
Diffstat (limited to 'pexpect/popen_spawn.py')
| -rw-r--r-- | pexpect/popen_spawn.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pexpect/popen_spawn.py b/pexpect/popen_spawn.py index 389c505..887d0a4 100644 --- a/pexpect/popen_spawn.py +++ b/pexpect/popen_spawn.py @@ -128,8 +128,7 @@ class PopenSpawn(SpawnBase): automatically appended. Returns number of bytes written. ''' n = self.send(s) - n = n + self.send(self.linesep) - return n + return n + self.send(self.linesep) def wait(self): status = self.proc.wait() @@ -154,10 +153,7 @@ class PopenSpawn(SpawnBase): os.kill(self.proc.pid, sig) def sendeof(self): - if sys.platform == 'win32': - self.kill(signal.CTRL_BREAK_EVENT) - else: - self.kill(signal.SIGTERM) + self.proc.stdin.close() class PopenSpawnUnicode(SpawnBaseUnicode, PopenSpawn): |