summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMyles Borins <myles.borins@gmail.com>2018-12-20 15:29:34 -0500
committerNed Deily <nad@python.org>2018-12-20 15:29:34 -0500
commitd9a2aca839b1326e011ecca17ba7b45123c47a64 (patch)
treee0975dbae1269893a832eca4e8c1617067abc7b5
parentf347c6eb75ca46990cd7ad3efbe02002603d8460 (diff)
downloadcpython-git-d9a2aca839b1326e011ecca17ba7b45123c47a64.tar.gz
[2.7] bpo-31715 Add mimetype for extension .mjs (GH-3908) (GH-10978)
(cherry picked from 0854b92cd2)
-rw-r--r--Lib/mimetypes.py1
-rw-r--r--Misc/NEWS.d/next/Library/2018-08-15-16-22-30.bpo-31715.Iw8jS8.rst1
2 files changed, 2 insertions, 0 deletions
diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
index caecc11c37..afc053f135 100644
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -451,6 +451,7 @@ def _default_mime_types():
'.mht' : 'message/rfc822',
'.mhtml' : 'message/rfc822',
'.mif' : 'application/x-mif',
+ '.mjs' : 'application/javascript',
'.mov' : 'video/quicktime',
'.movie' : 'video/x-sgi-movie',
'.mp2' : 'audio/mpeg',
diff --git a/Misc/NEWS.d/next/Library/2018-08-15-16-22-30.bpo-31715.Iw8jS8.rst b/Misc/NEWS.d/next/Library/2018-08-15-16-22-30.bpo-31715.Iw8jS8.rst
new file mode 100644
index 0000000000..eacba28f9f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-08-15-16-22-30.bpo-31715.Iw8jS8.rst
@@ -0,0 +1 @@
+Associate ``.mjs`` file extension with ``application/javascript`` MIME Type.