#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
diff --git a/Lib/os.py b/Lib/os.py
index 5dce0c1..a59c5df 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -643,7 +643,13 @@
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):