diff Modules/_struct.c @ 50804:427e43d0e031 3.0

Merged revisions 68619 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r68619 | mark.dickinson | 2009-01-15 19:32:23 +0000 (Thu, 15 Jan 2009) | 8 lines Issue 4910, patch 2 of (probably) 3: pave the way for renaming of nb_long: remove last remaining use of nb_long (in the struct module) from the core, set nb_long slots on all builtin and extension types to 0, and remove uses of __long__ in test_complex and test_binop. Reviewed by Benjamin Peterson. ........
author Mark Dickinson <dickinsm@gmail.com>
date Thu, 15 Jan 2009 21:13:53 +0000
parents fb905890d049
children 8325eb041921
line wrap: on
line diff
--- a/Modules/_struct.c	Thu Jan 15 15:37:41 2009 +0000
+++ b/Modules/_struct.c	Thu Jan 15 21:13:53 2009 +0000
@@ -127,8 +127,8 @@
 		return v;
 	}
 	m = Py_TYPE(v)->tp_as_number;
-	if (m != NULL && m->nb_long != NULL) {
-		v = m->nb_long(v);
+	if (m != NULL && m->nb_int != NULL) {
+		v = m->nb_int(v);
 		if (v == NULL)
 			return NULL;
 		if (PyLong_Check(v))