cpython: a3ba5fe9bfd3 (original) (raw)
Mercurial > cpython
changeset 80034:a3ba5fe9bfd3
Issue #16316: mimetypes now recognizes the .xz and .txz (.tar.xz) extensions. Patch by Serhiy Storchaka. [#16316]
| Nadeem Vawda nadeem.vawda@gmail.com | |
|---|---|
| date | Sun, 28 Oct 2012 14:52:34 +0100 |
| parents | e59e274551e0 |
| children | 3bc1784be9aa |
| files | Lib/mimetypes.py Lib/test/test_mimetypes.py Misc/NEWS |
| diffstat | 3 files changed, 7 insertions(+), 0 deletions(-)[+] [-] Lib/mimetypes.py 2 Lib/test/test_mimetypes.py 2 Misc/NEWS 3 |
line wrap: on
line diff
--- 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',[](#l1.7) }[](#l1.8)
encodings_map = { '.gz': 'gzip', '.Z': 'compress', '.bz2': 'bzip2',
'.xz': 'xz',[](#l1.14) }[](#l1.15)
# Before adding new types, make sure they are either registered with IANA,
--- a/Lib/test/test_mimetypes.py +++ b/Lib/test/test_mimetypes.py @@ -22,6 +22,8 @@ class MimeTypesTestCase(unittest.TestCas eq(self.db.guess_type("foo.tgz"), ("application/x-tar", "gzip")) eq(self.db.guess_type("foo.tar.gz"), ("application/x-tar", "gzip")) eq(self.db.guess_type("foo.tar.Z"), ("application/x-tar", "compress"))
eq(self.db.guess_type("foo.tar.bz2"), ("application/x-tar", "bzip2"))[](#l2.7)eq(self.db.guess_type("foo.tar.xz"), ("application/x-tar", "xz"))[](#l2.8)
def test_data_urls(self): eq = self.assertEqual
--- a/Misc/NEWS +++ b/Misc/NEWS @@ -62,6 +62,9 @@ Core and Builtins Library ------- +- Issue #16316: mimetypes now recognizes the .xz and .txz (.tar.xz) extensions.