#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/test/test_popen.py b/Lib/test/test_popen.py
index d728792..99ad41d 100644
--- a/Lib/test/test_popen.py
+++ b/Lib/test/test_popen.py
@@ -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)