[Python-checkins] cpython (merge 3.2 -> default): #15199: Fix JavaScript's default MIME type to application/javascript
petri.lehtinen
python-checkins at python.org
Mon Aug 20 20:36:27 CEST 2012
http://hg.python.org/cpython/rev/d4d5cfef5323
changeset: 78684:d4d5cfef5323
parent: 78680:2eafe04cb6ed
parent: 78683:b64947b6f947
user: Petri Lehtinen <petri at digip.org>
date: Mon Aug 20 21:30:03 2012 +0300
summary:
#15199: Fix JavaScript's default MIME type to application/javascript
files:
Lib/mimetypes.py | 2 +-
Misc/ACKS | 1 +
Misc/NEWS | 3 +++
3 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -429,7 +429,7 @@
'.jpe' : 'image/jpeg',
'.jpeg' : 'image/jpeg',
'.jpg' : 'image/jpeg',
- '.js' : 'application/x-javascript',
+ '.js' : 'application/javascript',
'.ksh' : 'text/plain',
'.latex' : 'application/x-latex',
'.m1v' : 'video/mpeg',
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -533,6 +533,7 @@
Sijin Joseph
Andreas Jung
Tattoo Mabonzo K.
+Bohuslav Kabrda
Bob Kahn
Kurt B. Kaiser
Tamito Kajiyama
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,6 +22,9 @@
Library
-------
+- Issue #15199: Fix JavaScript's default MIME type to application/javascript.
+ Patch by Bohuslav Kabrda.
+
- Issue #12643: code.InteractiveConsole now respects sys.excepthook when
displaying exceptions (Patch by Aaron Iles)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list