From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 14 Nov 2017 09:35:13 +0000 (-0800)
Subject: bpo-16055: Fixes incorrect error text for int('1', base=1000) (GH-4376) (#4389)
X-Git-Tag: v3.6.4rc1~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=58cbae22930486814cc01cf9f981d9fe5e0c68f9;p=python

bpo-16055: Fixes incorrect error text for int('1', base=1000) (GH-4376) (#4389)

(cherry picked from commit 28b624825eb92cb8c96fbf8da267d8d14a61a841)
---

diff --git a/Objects/longobject.c b/Objects/longobject.c
index 450087b5b1..c0cd7c12be 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;
     }