summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-04-09 05:00:53 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2016-04-09 05:00:53 (GMT)
commit734423b87b49913dcd21cffe5d4f086df04c4df8 (patch)
treef184e14e54fe3193fd577bc80efed459d8a8f09b
parentba22cf8bdce7ddfdf4c6fcac27987a5413b4074f (diff)
parentd7fdc86153daf42a1f77e5bdf6bf68838f6ba338 (diff)
downloadcpython-734423b87b49913dcd21cffe5d4f086df04c4df8.zip
cpython-734423b87b49913dcd21cffe5d4f086df04c4df8.tar.gz
cpython-734423b87b49913dcd21cffe5d4f086df04c4df8.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 da10aeb..2bb6396 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -237,6 +237,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 #26587: the site module now allows .pth files to specify files to be