diff options
| -rw-r--r-- | Doc/library/json.rst | 17 | ||||
| -rw-r--r-- | Lib/json/__init__.py | 2 |
2 files changed, 8 insertions, 11 deletions
diff --git a/Doc/library/json.rst b/Doc/library/json.rst index a26001d..1e8a87b 100644 --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -118,9 +118,8 @@ Basic Usage file-like object). If *skipkeys* is ``True`` (default: ``False``), then dict keys that are not - of a basic type (:class:`bytes`, :class:`str`, :class:`int`, - :class:`float`, :class:`bool`, ``None``) will be skipped instead of raising a - :exc:`TypeError`. + of a basic type (:class:`str`, :class:`int`, :class:`float`, :class:`bool`, + ``None``) will be skipped instead of raising a :exc:`TypeError`. The :mod:`json` module always produces :class:`str` objects, not :class:`bytes` objects. Therefore, ``fp.write()`` must support :class:`str` @@ -201,15 +200,11 @@ Basic Usage .. function:: loads(s, encoding=None, cls=None, object_hook=None, parse_float=None, parse_int=None, parse_constant=None, object_pairs_hook=None, **kw) - Deserialize *s* (a :class:`bytes` or :class:`str` instance containing a JSON - document) to a Python object. - - If *s* is a :class:`bytes` instance and is encoded with an ASCII based encoding - other than UTF-8 (e.g. latin-1), then an appropriate *encoding* name must be - specified. Encodings that are not ASCII based (such as UCS-2) are not - allowed and should be decoded to :class:`str` first. + Deserialize *s* (a :class:`str` instance containing a JSON document) to a + Python object. - The other arguments have the same meaning as in :func:`load`. + The other arguments have the same meaning as in :func:`load`, except + *encoding* which is ignored and deprecated. Encoders and decoders diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py index d71c2ce..a746f9c 100644 --- a/Lib/json/__init__.py +++ b/Lib/json/__init__.py @@ -298,6 +298,8 @@ def loads(s, encoding=None, cls=None, object_hook=None, parse_float=None, To use a custom ``JSONDecoder`` subclass, specify it with the ``cls`` kwarg; otherwise ``JSONDecoder`` is used. + The ``encoding`` argument is ignored and deprecated. + """ if (cls is None and object_hook is None and parse_int is None and parse_float is None and |