diff options
| author | Brett Cannon <brett@python.org> | 2012-10-28 15:48:24 (GMT) |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2012-10-28 15:48:24 (GMT) |
| commit | 0e8c49d3583bbe86dd26f07819fd526eda8a0dcc (patch) | |
| tree | cd085f2d606c69f7569e5006b6fa98faf7001197 /Lib/mimetypes.py | |
| parent | 6a85f3cbe4b43860c527c43bd5da0220c4f96c0e (diff) | |
| parent | 8ca705d5495f02ad93380e1f960adb98f7c00e22 (diff) | |
| download | cpython-0e8c49d3583bbe86dd26f07819fd526eda8a0dcc.zip cpython-0e8c49d3583bbe86dd26f07819fd526eda8a0dcc.tar.gz cpython-0e8c49d3583bbe86dd26f07819fd526eda8a0dcc.tar.bz2 | |
merge
Diffstat (limited to 'Lib/mimetypes.py')
| -rw-r--r-- | Lib/mimetypes.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py index 3f0bd0e..2872ee4 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, |