summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2017-09-06 22:31:36 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2017-09-06 22:31:36 (GMT)
commit47e5f791223773dd46273153e9fa5b48f848f0c9 (patch)
treec34c7c7d3771cc32b6e3a3ce209b1f4054196473
parent2bc83afb30850f682487ffa560c9e3663788baaa (diff)
downloadcpython-47e5f791223773dd46273153e9fa5b48f848f0c9.zip
cpython-47e5f791223773dd46273153e9fa5b48f848f0c9.tar.gz
cpython-47e5f791223773dd46273153e9fa5b48f848f0c9.tar.bz2
[2.7] bpo-30824: Add mimetype for .json (GH-3048) (#3394)
(cherry picked from commit 8204b903683f9e0f037ccfaa87622716019914d7)
-rw-r--r--Lib/mimetypes.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
index 157d455..caecc11 100644
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -442,6 +442,7 @@ def _default_mime_types():
'.jpeg' : 'image/jpeg',
'.jpg' : 'image/jpeg',
'.js' : 'application/javascript',
+ '.json' : 'application/json',
'.ksh' : 'text/plain',
'.latex' : 'application/x-latex',
'.m1v' : 'video/mpeg',