summaryrefslogtreecommitdiffstats
path: root/Objects/abstract.c
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2015-11-02 05:04:46 (GMT)
committerRaymond Hettinger <python@rcn.com>2015-11-02 05:04:46 (GMT)
commit0bdf9ea136c4acca2de0fe6ab799ab35d5b09fd2 (patch)
tree4b47f7e8db6a919ad9e1dd8da0f21144754e7ffa /Objects/abstract.c
parent67b97b8f8dc792aa7e1130a52a0ccc5069c400ed (diff)
parente56a9191000d2ff15d7550b9c852fa6dee9b8f50 (diff)
downloadcpython-0bdf9ea136c4acca2de0fe6ab799ab35d5b09fd2.zip
cpython-0bdf9ea136c4acca2de0fe6ab799ab35d5b09fd2.tar.gz
cpython-0bdf9ea136c4acca2de0fe6ab799ab35d5b09fd2.tar.bz2
merge
Diffstat (limited to 'Objects/abstract.c')
-rw-r--r--Objects/abstract.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c
index 039a4ca..63fcf15 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -1288,7 +1288,7 @@ PyNumber_Long(PyObject *o)
if (truncated == NULL || PyLong_Check(truncated))
return truncated;
/* __trunc__ is specified to return an Integral type,
- but int() needs to return a int. */
+ but int() needs to return an int. */
m = truncated->ob_type->tp_as_number;
if (m == NULL || m->nb_int == NULL) {
PyErr_Format(