summaryrefslogtreecommitdiff
path: root/Lib/mimetypes.py
diff options
context:
space:
mode:
authorNadeem Vawda <nadeem.vawda@gmail.com>2012-10-28 14:52:34 +0100
committerNadeem Vawda <nadeem.vawda@gmail.com>2012-10-28 14:52:34 +0100
commit84833aa7b4215bfbc15d2661fec326b5a49e7371 (patch)
treecadb2a2977d1edab3f151051a2c727177a6352fd /Lib/mimetypes.py
parent27ddb576f163f732a89111e3e66c2d8d5e43e9e8 (diff)
downloadcpython-git-84833aa7b4215bfbc15d2661fec326b5a49e7371.tar.gz
Issue #16316: mimetypes now recognizes the .xz and .txz (.tar.xz) extensions.
Patch by Serhiy Storchaka.
Diffstat (limited to 'Lib/mimetypes.py')
-rw-r--r--Lib/mimetypes.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
index 3f0bd0e719..2872ee4245 100644
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -378,12 +378,14 @@ def _default_mime_types():
'.taz': '.tar.gz',
'.tz': '.tar.gz',
'.tbz2': '.tar.bz2',
+ '.txz': '.tar.xz',
}
encodings_map = {
'.gz': 'gzip',
'.Z': 'compress',
'.bz2': 'bzip2',
+ '.xz': 'xz',
}
# Before adding new types, make sure they are either registered with IANA,