[Python-checkins] r86079 - in python/branches/release27-maint: Lib/multiprocessing/__init__.py Lib/test/test_multiprocessing.py

[brian.curtin]

Author: brian.curtin
Date: Mon Nov  1 06:15:55 2010
New Revision: 86079

Log:
Merged revisions 86077 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86077 | brian.curtin | 2010-11-01 00:10:44 -0500 (Mon, 01 Nov 2010) | 3 lines
  
  Fix some ResourceErrors.
  Use a context manager for os.popen and explicitly close a socket.
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/multiprocessing/__init__.py
   python/branches/release27-maint/Lib/test/test_multiprocessing.py

Modified: python/branches/release27-maint/Lib/multiprocessing/__init__.py
==============================================================================
--- python/branches/release27-maint/Lib/multiprocessing/__init__.py	(original)
+++ python/branches/release27-maint/Lib/multiprocessing/__init__.py	Mon Nov  1 06:15:55 2010
@@ -116,7 +116,8 @@
             num = 0
     elif 'bsd' in sys.platform or sys.platform == 'darwin':
         try:
-            num = int(os.popen('sysctl -n hw.ncpu').read())
+            with os.popen('sysctl -n hw.ncpu') as p:
+                num = int(p.read())
         except ValueError:
             num = 0
     else:

Modified: python/branches/release27-maint/Lib/test/test_multiprocessing.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_multiprocessing.py	(original)
+++ python/branches/release27-maint/Lib/test/test_multiprocessing.py	Mon Nov  1 06:15:55 2010
@@ -1259,7 +1259,11 @@
         authkey = os.urandom(32)
         manager = QueueManager(
             address=('localhost', 0), authkey=authkey, serializer=SERIALIZER)
-        addr = manager.get_server().address
+        srvr = manager.get_server()
+        addr = srvr.address
+        # Close the connection.Listener socket which gets opened as a part
+        # of manager.get_server(). It's not needed for the test.
+        srvr.listener.close()
         manager.start()
 
         p = self.Process(target=self._putter, args=(manager.address, authkey))