summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2009-11-15 14:25:16 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2009-11-15 14:25:16 (GMT)
commitb8108e2425546635176495dec0d70d3c87a1f309 (patch)
treebc52314e29d106ab4c243bbe8c296b43c2dd565b /Misc
parent6f1d04945b98cd66b95131833942526c85bbb867 (diff)
downloadcpython-b8108e2425546635176495dec0d70d3c87a1f309.zip
cpython-b8108e2425546635176495dec0d70d3c87a1f309.tar.gz
cpython-b8108e2425546635176495dec0d70d3c87a1f309.tar.bz2
Merged revisions 76306 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r76306 | antoine.pitrou | 2009-11-15 15:10:48 +0100 (dim., 15 nov. 2009) | 4 lines Issue #4969: The mimetypes module now reads the MIME database from the registry under Windows. Patch by Gabriel Genellina. ........
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 9480d9f..438352e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -132,6 +132,9 @@ C-API
Library
-------
+- Issue #4969: The mimetypes module now reads the MIME database from
+ the registry under Windows. Patch by Gabriel Genellina.
+
- 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