Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions Lib/mimetypes.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
read_mime_types(file) -- parse one file, return a dictionary or None
"""

import sys

try:
from _winapi import _mimetypes_read_windows_registry
except ImportError:
Expand All @@ -40,17 +42,23 @@
"suffix_map", "encodings_map", "types_map", "common_types"
]

knownfiles = [
"/etc/mime.types",
"/etc/httpd/mime.types", # Mac OS X
"/etc/httpd/conf/mime.types", # Apache
"/etc/apache/mime.types", # Apache 1
"/etc/apache2/mime.types", # Apache 2
"/usr/local/etc/httpd/conf/mime.types",
"/usr/local/lib/netscape/mime.types",
"/usr/local/etc/httpd/conf/mime.types", # Apache 1.2
"/usr/local/etc/mime.types", # Apache 1.3
]
if sys.platform == "win32":
# The default paths would resolve to the root of the current drive on Windows
# (e.g. C:\etc\mime.types), which unprivileged users can usually create.
# Only the registry is used by default.
knownfiles = []
else:
knownfiles = [
"/etc/mime.types",
"/etc/httpd/mime.types", # Mac OS X
"/etc/httpd/conf/mime.types", # Apache
"/etc/apache/mime.types", # Apache 1
"/etc/apache2/mime.types", # Apache 2
"/usr/local/etc/httpd/conf/mime.types",
"/usr/local/lib/netscape/mime.types",
"/usr/local/etc/httpd/conf/mime.types", # Apache 1.2
"/usr/local/etc/mime.types", # Apache 1.3
]

inited = False
_db = None
Expand Down
7 changes: 7 additions & 0 deletions Lib/test/test_mimetypes.py
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,10 @@ def test_init_knownfiles(self):
mimetypes.init()
self.assertEqual(guess_file_type("file.test2")[0], "testing/test2")

@unittest.skipIf(sys.platform == "win32", "non-Windows only")
def test_default_knownfiles(self):
self.assertIn("/etc/mime.types", knownfiles)

def test_added_types_are_used(self):
mimetypes.add_type('testing/default-type', '')
mime_type, _ = mimetypes.guess_type('')
Expand Down Expand Up @@ -555,6 +559,9 @@ def test_registry_parsing(self):
eq(self.db.guess_type("image.jpg"), ("image/jpeg", None))
eq(self.db.guess_type("image.png"), ("image/png", None))

def test_default_knownfiles(self):
self.assertEqual(knownfiles, [])

@unittest.skipIf(not hasattr(_winapi, "_mimetypes_read_windows_registry"),
"read_windows_registry accelerator unavailable")
def test_registry_accelerator(self):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
:mod:`mimetypes` no longer reads the files listed in :data:`mimetypes.knownfiles`
by default on Windows, and uses only the registry.
Loading