summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2010-03-22 17:48:48 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2010-03-22 17:48:48 (GMT)
commitca2edce67695b73e21a64a352632feedc08ccf29 (patch)
tree31a8b7165f119926996154cb3104e0a04544f713 /Misc
parent37c1f18a7224e00f61b2141420c24dc6f391abb9 (diff)
downloadcpython-ca2edce67695b73e21a64a352632feedc08ccf29.zip
cpython-ca2edce67695b73e21a64a352632feedc08ccf29.tar.gz
cpython-ca2edce67695b73e21a64a352632feedc08ccf29.tar.bz2
Merged revisions 79294 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r79294 | r.david.murray | 2010-03-22 11:55:09 -0400 (Mon, 22 Mar 2010) | 4 lines Issue #7860: platform.uname now reports the correct 'machine' type when Python is running in WOW64 mode on 64 bit Windows. Patch by Brian Curtin. ........
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS3
1 files changed, 3 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index a27dd11..8d4706d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -287,6 +287,9 @@ C-API
Library
-------
+- Issue #7860: platform.uname now reports the correct 'machine' type
+ when Python is running in WOW64 mode on 64 bit Windows.
+
- Issue #3890: Fix recv() and recv_into() on non-blocking SSL sockets.
- Issue #4282: Fix the main function of the profile module for a non-ASCII