summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-08-02 20:16:18 (GMT)
committerGeorg Brandl <georg@python.org>2010-08-02 20:16:18 (GMT)
commitc8284cfc572fbaadb1f436aac4480a3f386bba54 (patch)
treea0367e9df40275fc72d7fb6045d8d2b995f368d4 /Modules
parent8477f82c3e864cf0e1970b37afde82576cce8d06 (diff)
downloadcpython-c8284cfc572fbaadb1f436aac4480a3f386bba54.zip
cpython-c8284cfc572fbaadb1f436aac4480a3f386bba54.tar.gz
cpython-c8284cfc572fbaadb1f436aac4480a3f386bba54.tar.bz2
#9087: update json docstrings -- unicode and long do not exist anymore.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_json.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/_json.c b/Modules/_json.c
index 9a3708d..2e39525 100644
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -484,7 +484,7 @@ bail:
}
PyDoc_STRVAR(pydoc_scanstring,
- "scanstring(basestring, end, strict=True) -> (bytes, end)\n"
+ "scanstring(string, end, strict=True) -> (string, end)\n"
"\n"
"Scan the string s for a JSON string. End is the index of the\n"
"character in s after the quote that started the JSON string.\n"
@@ -512,7 +512,7 @@ py_scanstring(PyObject* self UNUSED, PyObject *args)
}
else {
PyErr_Format(PyExc_TypeError,
- "first argument must be a string or bytes, not %.80s",
+ "first argument must be a string, not %.80s",
Py_TYPE(pystr)->tp_name);
return NULL;
}
@@ -520,7 +520,7 @@ py_scanstring(PyObject* self UNUSED, PyObject *args)
}
PyDoc_STRVAR(pydoc_encode_basestring_ascii,
- "encode_basestring_ascii(basestring) -> bytes\n"
+ "encode_basestring_ascii(string) -> string\n"
"\n"
"Return an ASCII-only JSON representation of a Python string"
);