summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-04-09 05:00:20 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2016-04-09 05:00:20 (GMT)
commitd7fdc86153daf42a1f77e5bdf6bf68838f6ba338 (patch)
treefed6cc602a049e65bef682642ce7e3a11b0d9ee1
parenta2d7cf087f5496dd86c99a9b64821bb35be26bba (diff)
downloadcpython-d7fdc86153daf42a1f77e5bdf6bf68838f6ba338.zip
cpython-d7fdc86153daf42a1f77e5bdf6bf68838f6ba338.tar.gz
cpython-d7fdc86153daf42a1f77e5bdf6bf68838f6ba338.tar.bz2
Issue #16329: Add .webm to mimetypes.types_map
Patch by Giampaolo Rodola'.
-rw-r--r--Lib/mimetypes.py1
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 0 deletions
diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
index f02d62d..0be76ad 100644
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -514,6 +514,7 @@ def _default_mime_types():
'.ustar' : 'application/x-ustar',
'.vcf' : 'text/x-vcard',
'.wav' : 'audio/x-wav',
+ '.webm' : 'video/webm',
'.wiz' : 'application/msword',
'.wsdl' : 'application/xml',
'.xbm' : 'image/x-xbitmap',
diff --git a/Misc/NEWS b/Misc/NEWS
index 735cb8a..676f37e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -99,6 +99,8 @@ Core and Builtins
Library
-------
+- Issue #16329: Add .webm to mimetypes.types_map. Patch by Giampaolo Rodola'.
+
- Issue #13952: Add .csv to mimetypes.types_map. Patch by Geoff Wilson.
- Issue #26709: Fixed Y2038 problem in loading binary PLists.