commit 8055afd0197862a3358fb219f5bb60233288fe02
author Mark Dickinson <dickinsm@gmail.com> Sat Jan 17 10:04:45 2009 +0000
committer Mark Dickinson <dickinsm@gmail.com> Sat Jan 17 10:04:45 2009 +0000
tree 28f57e526a9cdc334a7684df302ca55da5bbf1ad
parent 0bbcc4cf9853fe4864a481e303a9f8d22cf2dc36

Issue #4910, patch 3/3:  rename nb_long to nb_reserved

Objects/boolobject.c

diff --git a/Objects/boolobject.c b/Objects/boolobject.c
index 6916b9f..eac31b9 100644
--- a/Objects/boolobject.c
+++ b/Objects/boolobject.c
@@ -109,7 +109,7 @@
 	bool_xor,		/* nb_xor */
 	bool_or,		/* nb_or */
 	0,			/* nb_int */
-	0,			/* nb_long */
+	0,			/* nb_reserved */
 	0,			/* nb_float */
 	0,			/* nb_inplace_add */
 	0,			/* nb_inplace_subtract */

Objects/complexobject.c

diff --git a/Objects/complexobject.c b/Objects/complexobject.c
index a7fd7dc..879d71c 100644
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -1060,7 +1060,7 @@
 	0,					/* nb_xor */
 	0,					/* nb_or */
 	complex_int,				/* nb_int */
-	0,					/* nb_long */
+	0,					/* nb_reserved */
 	complex_float,				/* nb_float */
 	0,					/* nb_inplace_add */
 	0,					/* nb_inplace_subtract */

Objects/floatobject.c

diff --git a/Objects/floatobject.c b/Objects/floatobject.c
index 7292ca5..a3c4e45 100644
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -1798,7 +1798,7 @@
 	0,		/*nb_xor*/
 	0,		/*nb_or*/
 	float_trunc,	/*nb_int*/
-	0,		/*nb_long*/
+	0,		/*nb_reserved*/
 	float_float,	/*nb_float*/
 	0,		/* nb_inplace_add */
 	0,		/* nb_inplace_subtract */

Objects/longobject.c

diff --git a/Objects/longobject.c b/Objects/longobject.c
index 259f7c5..b7ba796 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -3830,7 +3830,7 @@
 			long_xor,	/*nb_xor*/
 			long_or,	/*nb_or*/
 			long_long,	/*nb_int*/
-	0,				/*nb_long*/
+	0,				/*nb_reserved*/
 			long_float,	/*nb_float*/
 	0,				/* nb_inplace_add */
 	0,				/* nb_inplace_subtract */

Objects/setobject.c

diff --git a/Objects/setobject.c b/Objects/setobject.c
index d3243dd..d5d96ca 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -2082,7 +2082,7 @@
 	(binaryfunc)set_xor,		/*nb_xor*/
 	(binaryfunc)set_or,		/*nb_or*/
 	0,				/*nb_int*/
-	0,				/*nb_long*/
+	0,				/*nb_reserved*/
 	0,				/*nb_float*/
 	0,				/*nb_inplace_add*/
 	(binaryfunc)set_isub,		/*nb_inplace_subtract*/

Objects/typeobject.c

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 8921b5f..b02f108 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3602,7 +3602,6 @@
 		COPYNUM(nb_xor);
 		COPYNUM(nb_or);
 		COPYNUM(nb_int);
-		COPYNUM(nb_long);
 		COPYNUM(nb_float);
 		COPYNUM(nb_inplace_add);
 		COPYNUM(nb_inplace_subtract);
@@ -4827,7 +4826,6 @@
 SLOT1BIN(slot_nb_or, nb_or, "__or__", "__ror__")
 
 SLOT0(slot_nb_int, "__int__")
-SLOT0(slot_nb_long, "__long__")
 SLOT0(slot_nb_float, "__float__")
 SLOT1(slot_nb_inplace_add, "__iadd__", PyObject *, "O")
 SLOT1(slot_nb_inplace_subtract, "__isub__", PyObject *, "O")
@@ -5443,8 +5441,6 @@
 	RBINSLOT("__ror__", nb_or, slot_nb_or, "|"),
 	UNSLOT("__int__", nb_int, slot_nb_int, wrap_unaryfunc,
 	       "int(x)"),
-	UNSLOT("__long__", nb_long, slot_nb_long, wrap_unaryfunc,
-	       "int(x)"),
 	UNSLOT("__float__", nb_float, slot_nb_float, wrap_unaryfunc,
 	       "float(x)"),
 	NBSLOT("__index__", nb_index, slot_nb_index, wrap_unaryfunc, 

Objects/weakrefobject.c

diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
index 538b21c..b65e5fd 100644
--- a/Objects/weakrefobject.c
+++ b/Objects/weakrefobject.c
@@ -594,7 +594,7 @@
     proxy_xor,              /*nb_xor*/
     proxy_or,               /*nb_or*/
     proxy_int,              /*nb_int*/
-    0,                      /*nb_long*/
+    0,                      /*nb_reserved*/
     proxy_float,            /*nb_float*/
     proxy_iadd,             /*nb_inplace_add*/
     proxy_isub,             /*nb_inplace_subtract*/