[Python-checkins] cpython (merge 3.5 -> default): Issue #16329: Add .webm to mimetypes.types_map

[berker.peksag]

https://hg.python.org/cpython/rev/f92e6785b9f0
changeset:   100882:f92e6785b9f0
parent:      100880:5143f86ffe57
parent:      100881:0327a5a11108
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Sat Apr 09 08:00:53 2016 +0300
summary:
  Issue #16329: Add .webm to mimetypes.types_map

Patch by Giampaolo Rodola'.

files:
  Lib/mimetypes.py |  1 +
  Misc/NEWS        |  2 ++
  2 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -514,6 +514,7 @@
         '.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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -237,6 +237,8 @@
 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

-- 
Repository URL: https://hg.python.org/cpython