[Python-checkins] r73935 - in python/branches/release31-maint: Lib/os.py Lib/test/test_popen.py Misc/NEWS

[amaury.forgeotdarc]

Author: amaury.forgeotdarc
Date: Sat Jul 11 11:37:09 2009
New Revision: 73935

Log:
Merged revisions 73934 via svnmerge from 
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
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/os.py
   python/branches/release31-maint/Lib/test/test_popen.py
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Lib/os.py
==============================================================================
--- python/branches/release31-maint/Lib/os.py	(original)
+++ python/branches/release31-maint/Lib/os.py	Sat Jul 11 11:37:09 2009
@@ -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):

Modified: python/branches/release31-maint/Lib/test/test_popen.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_popen.py	(original)
+++ python/branches/release31-maint/Lib/test/test_popen.py	Sat Jul 11 11:37:09 2009
@@ -42,6 +42,13 @@
         )
         support.reap_children()
 
+    def test_return_code(self):
+        self.assertEqual(os.popen("exit 0").close(), None)
+        if os.name == 'nt':
+            self.assertEqual(os.popen("exit 42").close(), 42)
+        else:
+            self.assertEqual(os.popen("exit 42").close(), 42 << 8)
+
 def test_main():
     support.run_unittest(PopenTest)
 

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Sat Jul 11 11:37:09 2009
@@ -34,6 +34,9 @@
 Library
 -------
 
+- Issue #6358: The exit status of a command started with os.popen() was
+  reported differently than it did with python 2.x.
+
 - Issue #6323: The pdb debugger did not exit when running a script with a
   syntax error.