changeset: 78683:b64947b6f947 branch: 3.2 parent: 78679:80b15cf2611e user: Petri Lehtinen date: Mon Aug 20 21:05:56 2012 +0300 files: Lib/mimetypes.py Misc/ACKS Misc/NEWS description: #15199: Fix JavaScript's default MIME type to application/javascript diff -r 80b15cf2611e -r b64947b6f947 Lib/mimetypes.py --- a/Lib/mimetypes.py Mon Aug 20 14:14:18 2012 -0400 +++ b/Lib/mimetypes.py Mon Aug 20 21:05:56 2012 +0300 @@ -430,7 +430,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 -r 80b15cf2611e -r b64947b6f947 Misc/ACKS --- a/Misc/ACKS Mon Aug 20 14:14:18 2012 -0400 +++ b/Misc/ACKS Mon Aug 20 21:05:56 2012 +0300 @@ -480,6 +480,7 @@ Sijin Joseph Andreas Jung Tattoo Mabonzo K. +Bohuslav Kabrda Bob Kahn Kurt B. Kaiser Tamito Kajiyama diff -r 80b15cf2611e -r b64947b6f947 Misc/NEWS --- a/Misc/NEWS Mon Aug 20 14:14:18 2012 -0400 +++ b/Misc/NEWS Mon Aug 20 21:05:56 2012 +0300 @@ -107,6 +107,9 @@ Library ------- +- Issue #15199: Fix JavaScript's default MIME type to application/javascript. + Patch by Bohuslav Kabrda. + - Issue #13579: string.Formatter now understands the 'a' conversion specifier. - Issue #15595: Fix subprocess.Popen(universal_newlines=True)