diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-01-21 21:39:56 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-01-21 21:39:56 (GMT) |
| commit | a970e6225885292974d266112cc39f350fdf979e (patch) | |
| tree | 6cc8f655e9d9b949f5de9cda69094573fd741383 /Lib/json | |
| parent | 6107a4e24a0347df6c1e337a23bdcc735539a0cf (diff) | |
| download | cpython-a970e6225885292974d266112cc39f350fdf979e.zip cpython-a970e6225885292974d266112cc39f350fdf979e.tar.gz cpython-a970e6225885292974d266112cc39f350fdf979e.tar.bz2 | |
Merged revisions 88137 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88137 | antoine.pitrou | 2011-01-21 22:37:32 +0100 (ven., 21 janv. 2011) | 3 lines
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 |