mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 73934 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r73934 | amaury.forgeotdarc | 2009-07-11 11:35:13 +0200 (sam., 11 juil. 2009) | 3 lines

  #6358: Merge r73933: Add basic tests for the return value of os.popen().close().
  And fix the implementation to make these tests pass with py3k
........
This commit is contained in:
Amaury Forgeot d'Arc 2009-07-11 09:37:09 +00:00
parent 1caf206ac9
commit 041b3baf53
3 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/os.py
View file

@ -643,7 +643,13 @@ class _wrap_close:
self._proc = proc
def close(self):
self._stream.close()
return self._proc.wait() << 8 # Shift left to match old behavior
returncode = self._proc.wait()
if returncode == 0:
return None
if name == 'nt':
return returncode
else:
return returncode << 8 # Shift left to match old behavior
def __getattr__(self, name):
return getattr(self._stream, name)
def __iter__(self):