summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-04-09 05:05:18 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2016-04-09 05:05:18 (GMT)
commit265bc81fa38852ce8bd624ecc0972a2500d0f83c (patch)
tree2694eaf61d4230b86fd9d420e026720ef75fe77c
parent86e0d5761177ef3fe7b50f7e9f235c70960d7834 (diff)
downloadcpython-265bc81fa38852ce8bd624ecc0972a2500d0f83c.zip
cpython-265bc81fa38852ce8bd624ecc0972a2500d0f83c.tar.gz
cpython-265bc81fa38852ce8bd624ecc0972a2500d0f83c.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 a39b543..c0316a0 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 c0e0e4d..894d669 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -65,6 +65,8 @@ Core and Builtins
Library
-------
+- Issue #16329: Add .webm to mimetypes.types_map. Patch by Giampaolo Rodola'.
+
- Issue #23735: Handle terminal resizing with Readline 6.3+ by installing our
own SIGWINCH handler. Patch by Eric Price.