diff options
| author | Brian Curtin <brian.curtin@gmail.com> | 2010-11-01 05:12:34 (GMT) |
|---|---|---|
| committer | Brian Curtin <brian.curtin@gmail.com> | 2010-11-01 05:12:34 (GMT) |
| commit | 9e2fadcbddbb0de515fc8c920c5de9181d6f604b (patch) | |
| tree | 5c8075ad165eb7410eab7555a086baf41820c8c7 /Lib/multiprocessing | |
| parent | 4531f8dd378c53e88257651eaa503086366fac1f (diff) | |
| download | cpython-9e2fadcbddbb0de515fc8c920c5de9181d6f604b.zip cpython-9e2fadcbddbb0de515fc8c920c5de9181d6f604b.tar.gz cpython-9e2fadcbddbb0de515fc8c920c5de9181d6f604b.tar.bz2 | |
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.
........
Diffstat (limited to 'Lib/multiprocessing')
| -rw-r--r-- | Lib/multiprocessing/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/multiprocessing/__init__.py b/Lib/multiprocessing/__init__.py index 5a13742..b808a5b 100644 --- a/Lib/multiprocessing/__init__.py +++ b/Lib/multiprocessing/__init__.py @@ -115,7 +115,8 @@ def cpu_count(): 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: |