summaryrefslogtreecommitdiffstats
path: root/Doc/library/json.rst
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2016-10-19 13:37:13 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2016-10-19 13:37:13 (GMT)
commit989db5c880cbe85e49857cf44daf8b6c9ccbe0b6 (patch)
tree2e6fb67dca920efd5e8bdae70706badcc3472e43 /Doc/library/json.rst
parent24c3b4928eb3046a02b55ab4317cee28aa1c56ba (diff)
parentecf41da83e5db98734b19f205899168cc56da943 (diff)
downloadcpython-989db5c880cbe85e49857cf44daf8b6c9ccbe0b6.zip
cpython-989db5c880cbe85e49857cf44daf8b6c9ccbe0b6.tar.gz
cpython-989db5c880cbe85e49857cf44daf8b6c9ccbe0b6.tar.bz2
Issue #19795: Mark up None as literal text.
Diffstat (limited to 'Doc/library/json.rst')
-rw-r--r--Doc/library/json.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/library/json.rst b/Doc/library/json.rst
index 302f839..033e3fc 100644
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -407,8 +407,9 @@ Encoders and Decoders
(to raise :exc:`TypeError`).
If *skipkeys* is false (the default), then it is a :exc:`TypeError` to
- attempt encoding of keys that are not str, int, float or None. If
- *skipkeys* is true, such items are simply skipped.
+ attempt encoding of keys that are not :class:`str`, :class:`int`,
+ :class:`float` or ``None``. If *skipkeys* is true, such items are simply
+ skipped.
If *ensure_ascii* is true (the default), the output is guaranteed to
have all incoming non-ASCII characters escaped. If *ensure_ascii* is