diff options
author | Nick Coghlan <ncoghlan@gmail.com> | 2009-11-15 23:27:31 (GMT) |
---|---|---|
committer | Nick Coghlan <ncoghlan@gmail.com> | 2009-11-15 23:27:31 (GMT) |
commit | b830a230c1718f23bccf6e0af9e3d8d32ef57b2c (patch) | |
tree | 516a52554155077e06dc5d1c9566fd9698eace9c /Misc | |
parent | f5b3a1498c32c70afe3d0baa25d83d112cab277f (diff) | |
download | cpython-b830a230c1718f23bccf6e0af9e3d8d32ef57b2c.zip cpython-b830a230c1718f23bccf6e0af9e3d8d32ef57b2c.tar.gz cpython-b830a230c1718f23bccf6e0af9e3d8d32ef57b2c.tar.bz2 |
Recorded merge of revisions 76314 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r76314 | nick.coghlan | 2009-11-16 09:04:33 +1000 (Mon, 16 Nov 2009) | 9 lines
Merged revisions 76312 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r76312 | nick.coghlan | 2009-11-16 08:36:47 +1000 (Mon, 16 Nov 2009) | 1 line
Issue #7328: don't corrupt sys.path when running pydoc with the -m switch
........
................
Diffstat (limited to 'Misc')
-rw-r--r-- | Misc/NEWS | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -46,6 +46,8 @@ Core and Builtins Library ------- +- Issue #7328: pydoc no longer corrupts sys.path when run with the '-m' switch + - Issue #7318: multiprocessing now uses a timeout when it fails to establish a connection with another process, rather than looping endlessly. The default timeout is 20 seconds, which should be amply sufficient for |