summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2017-11-14 09:35:13 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2017-11-14 09:35:13 (GMT)
commit58cbae22930486814cc01cf9f981d9fe5e0c68f9 (patch)
tree1bbeccaf5c6c261c70df343d07bcabb12c60c11c
parent18056fb11e6fe6e5247cd03073bd74df8ac0acc7 (diff)
downloadcpython-58cbae22930486814cc01cf9f981d9fe5e0c68f9.zip
cpython-58cbae22930486814cc01cf9f981d9fe5e0c68f9.tar.gz
cpython-58cbae22930486814cc01cf9f981d9fe5e0c68f9.tar.bz2
bpo-16055: Fixes incorrect error text for int('1', base=1000) (GH-4376) (#4389)
(cherry picked from commit 28b624825eb92cb8c96fbf8da267d8d14a61a841)
-rw-r--r--Objects/longobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/longobject.c b/Objects/longobject.c
index 450087b..c0cd7c1 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -4820,7 +4820,7 @@ long_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
return NULL;
if ((base != 0 && base < 2) || base > 36) {
PyErr_SetString(PyExc_ValueError,
- "int() base must be >= 2 and <= 36");
+ "int() base must be >= 2 and <= 36, or 0");
return NULL;
}