diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-01-21 21:37:32 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-01-21 21:37:32 (GMT) |
| commit | 00d650baaa72477d6904cce9667ca18e916405e6 (patch) | |
| tree | b6931e71c154371ee8f7a60e53f3876983ab39b0 /Lib/json | |
| parent | 2e042d3dc26d852f9ad89edb2a48d40c376ba968 (diff) | |
| download | cpython-00d650baaa72477d6904cce9667ca18e916405e6.zip cpython-00d650baaa72477d6904cce9667ca18e916405e6.tar.gz cpython-00d650baaa72477d6904cce9667ca18e916405e6.tar.bz2 | |
Fix JSON docs about loads() accepting only str objects, not bytes.
Diffstat (limited to 'Lib/json')
| -rw-r--r-- | Lib/json/__init__.py | 2 |
1 files changed, 2 insertions, 0 deletions
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 |