summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2017-09-06 17:04:14 -0700
committerR. David Murray <rdmurray@bitdance.com>2017-09-06 20:04:14 -0400
commite29ab7e75138e198b51c8bd04afa16d9d2c976a5 (patch)
tree086281394748e622505547c718c381d644925f52
parentfd645ec6f5696e841e6d49075f9fd81e54e74d91 (diff)
downloadcpython-git-e29ab7e75138e198b51c8bd04afa16d9d2c976a5.tar.gz
[3.6] bpo-30824: Add mimetype for .json (GH-3048) (#3401)
(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 9a886803dc..5a7e6493bf 100644
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -439,6 +439,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',