From: Berker Peksag <berker.peksag@gmail.com>
Date: Sat, 9 Apr 2016 05:00:20 +0000 (+0300)
Subject: Issue #16329: Add .webm to mimetypes.types_map
X-Git-Tag: v3.6.0a1~251^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d7fdc86153daf42a1f77e5bdf6bf68838f6ba338;p=thirdparty%2FPython%2Fcpython.git

Issue #16329: Add .webm to mimetypes.types_map

Patch by Giampaolo Rodola'.
---

diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
index f02d62d49fa1..0be76ad4f754 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 735cb8ac3108..676f37e7e76b 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.