summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorTim Golden <mail@timgolden.me.uk>2013-10-22 18:27:34 (GMT)
committerTim Golden <mail@timgolden.me.uk>2013-10-22 18:27:34 (GMT)
commit27a856495eb1f61b21ab47bc9be86be57176153a (patch)
treea980e10fd5194992538fbe8442ff0b41343d94d4 /Doc
parent49e61806f5675c7830f2290f3099588bd8f221dc (diff)
downloadcpython-27a856495eb1f61b21ab47bc9be86be57176153a.zip
cpython-27a856495eb1f61b21ab47bc9be86be57176153a.tar.gz
cpython-27a856495eb1f61b21ab47bc9be86be57176153a.tar.bz2
Issue #15207: Fix mimetypes to read from correct area in Windows registry (Original patch by Dave Chambers)
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/mimetypes.rst3
1 files changed, 3 insertions, 0 deletions
diff --git a/Doc/library/mimetypes.rst b/Doc/library/mimetypes.rst
index be11c0d..12c9eca 100644
--- a/Doc/library/mimetypes.rst
+++ b/Doc/library/mimetypes.rst
@@ -85,6 +85,9 @@ behavior of the module.
:const:`knownfiles` takes precedence over those named before it. Calling
:func:`init` repeatedly is allowed.
+ Specifying an empty list for *files* will prevent the system defaults from
+ being applied: only the well-known values will be present from a built-in list.
+
.. versionchanged:: 3.2
Previously, Windows registry settings were ignored.