[Python-3000-checkins] r64149 - in python/branches/py3k: Doc/c-api/typeobj.rst Include/object.h Misc/NEWS Modules/datetimemodule.c Objects/boolobject.c Objects/complexobject.c Objects/floatobject.c Objects/longobject.c Objects/setobject.c Objects/weakrefobject.c PC/winreg.c
benjamin.peterson
python-3000-checkins at python.org
Wed Jun 11 22:21:58 CEST 2008
Author: benjamin.peterson
Date: Wed Jun 11 22:21:57 2008
New Revision: 64149
Log:
Remove nb_reserved (nb_coerce), nb_hex, and nb_oct from PyNumberMethods
Modified:
python/branches/py3k/Doc/c-api/typeobj.rst
python/branches/py3k/Include/object.h
python/branches/py3k/Misc/NEWS
python/branches/py3k/Modules/datetimemodule.c
python/branches/py3k/Objects/boolobject.c
python/branches/py3k/Objects/complexobject.c
python/branches/py3k/Objects/floatobject.c
python/branches/py3k/Objects/longobject.c
python/branches/py3k/Objects/setobject.c
python/branches/py3k/Objects/weakrefobject.c
python/branches/py3k/PC/winreg.c
Modified: python/branches/py3k/Doc/c-api/typeobj.rst
==============================================================================
--- python/branches/py3k/Doc/c-api/typeobj.rst (original)
+++ python/branches/py3k/Doc/c-api/typeobj.rst Wed Jun 11 22:21:57 2008
@@ -1049,13 +1049,9 @@
binaryfunc nb_and;
binaryfunc nb_xor;
binaryfunc nb_or;
- int nb_reserved; /* unused, must be zero */
unaryfunc nb_int;
unaryfunc nb_long;
unaryfunc nb_float;
-
- unaryfunc nb_oct; /* not used anymore, must be zero */
- unaryfunc nb_hex; /* not used anymore, must be zero */
binaryfunc nb_inplace_add;
binaryfunc nb_inplace_subtract;
Modified: python/branches/py3k/Include/object.h
==============================================================================
--- python/branches/py3k/Include/object.h (original)
+++ python/branches/py3k/Include/object.h Wed Jun 11 22:21:57 2008
@@ -215,13 +215,9 @@
binaryfunc nb_and;
binaryfunc nb_xor;
binaryfunc nb_or;
- int nb_reserved; /* unused, used to be nb_coerce */
unaryfunc nb_int;
unaryfunc nb_long;
unaryfunc nb_float;
- /* NB: nb_oct and nb_hex are not used anymore. */
- unaryfunc nb_oct;
- unaryfunc nb_hex;
binaryfunc nb_inplace_add;
binaryfunc nb_inplace_subtract;
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Wed Jun 11 22:21:57 2008
@@ -60,6 +60,9 @@
f_exc_type, f_exc_value, and f_exc_traceback cannot be accessed from Python
code anymore.
+- Three of PyNumberMethods' members, nb_coerce, nb_hex, and nb_oct, have been
+ removed.
+
Extension Modules
-----------------
Modified: python/branches/py3k/Modules/datetimemodule.c
==============================================================================
--- python/branches/py3k/Modules/datetimemodule.c (original)
+++ python/branches/py3k/Modules/datetimemodule.c Wed Jun 11 22:21:57 2008
@@ -2103,12 +2103,9 @@
0, /*nb_and*/
0, /*nb_xor*/
0, /*nb_or*/
- 0, /*nb_reserved*/
0, /*nb_int*/
0, /*nb_long*/
0, /*nb_float*/
- 0, /*nb_oct*/
- 0, /*nb_hex*/
0, /*nb_inplace_add*/
0, /*nb_inplace_subtract*/
0, /*nb_inplace_multiply*/
Modified: python/branches/py3k/Objects/boolobject.c
==============================================================================
--- python/branches/py3k/Objects/boolobject.c (original)
+++ python/branches/py3k/Objects/boolobject.c Wed Jun 11 22:21:57 2008
@@ -108,12 +108,9 @@
bool_and, /* nb_and */
bool_xor, /* nb_xor */
bool_or, /* nb_or */
- 0, /* nb_reserved */
0, /* nb_int */
0, /* nb_long */
0, /* nb_float */
- 0, /* nb_oct */
- 0, /* nb_hex */
0, /* nb_inplace_add */
0, /* nb_inplace_subtract */
0, /* nb_inplace_multiply */
Modified: python/branches/py3k/Objects/complexobject.c
==============================================================================
--- python/branches/py3k/Objects/complexobject.c (original)
+++ python/branches/py3k/Objects/complexobject.c Wed Jun 11 22:21:57 2008
@@ -1067,12 +1067,9 @@
0, /* nb_and */
0, /* nb_xor */
0, /* nb_or */
- 0, /* nb_reserved */
complex_int, /* nb_int */
complex_long, /* nb_long */
complex_float, /* nb_float */
- 0, /* nb_oct */
- 0, /* nb_hex */
0, /* nb_inplace_add */
0, /* nb_inplace_subtract */
0, /* nb_inplace_multiply*/
Modified: python/branches/py3k/Objects/floatobject.c
==============================================================================
--- python/branches/py3k/Objects/floatobject.c (original)
+++ python/branches/py3k/Objects/floatobject.c Wed Jun 11 22:21:57 2008
@@ -1381,12 +1381,9 @@
0, /*nb_and*/
0, /*nb_xor*/
0, /*nb_or*/
- 0, /*nb_reserved*/
float_trunc, /*nb_int*/
float_trunc, /*nb_long*/
float_float, /*nb_float*/
- 0, /* nb_oct */
- 0, /* nb_hex */
0, /* nb_inplace_add */
0, /* nb_inplace_subtract */
0, /* nb_inplace_multiply */
Modified: python/branches/py3k/Objects/longobject.c
==============================================================================
--- python/branches/py3k/Objects/longobject.c (original)
+++ python/branches/py3k/Objects/longobject.c Wed Jun 11 22:21:57 2008
@@ -3713,12 +3713,9 @@
long_and, /*nb_and*/
long_xor, /*nb_xor*/
long_or, /*nb_or*/
- 0, /*nb_reserved*/
long_long, /*nb_int*/
long_long, /*nb_long*/
long_float, /*nb_float*/
- 0, /*nb_oct*/ /* not used */
- 0, /*nb_hex*/ /* not used */
0, /* nb_inplace_add */
0, /* nb_inplace_subtract */
0, /* nb_inplace_multiply */
Modified: python/branches/py3k/Objects/setobject.c
==============================================================================
--- python/branches/py3k/Objects/setobject.c (original)
+++ python/branches/py3k/Objects/setobject.c Wed Jun 11 22:21:57 2008
@@ -2015,12 +2015,9 @@
(binaryfunc)set_and, /*nb_and*/
(binaryfunc)set_xor, /*nb_xor*/
(binaryfunc)set_or, /*nb_or*/
- 0, /*nb_reserved*/
0, /*nb_int*/
0, /*nb_long*/
0, /*nb_float*/
- 0, /*nb_oct*/
- 0, /*nb_hex*/
0, /*nb_inplace_add*/
(binaryfunc)set_isub, /*nb_inplace_subtract*/
0, /*nb_inplace_multiply*/
Modified: python/branches/py3k/Objects/weakrefobject.c
==============================================================================
--- python/branches/py3k/Objects/weakrefobject.c (original)
+++ python/branches/py3k/Objects/weakrefobject.c Wed Jun 11 22:21:57 2008
@@ -594,12 +594,9 @@
proxy_and, /*nb_and*/
proxy_xor, /*nb_xor*/
proxy_or, /*nb_or*/
- 0, /*nb_reserved*/
proxy_int, /*nb_int*/
proxy_long, /*nb_long*/
proxy_float, /*nb_float*/
- 0, /*nb_oct*/
- 0, /*nb_hex*/
proxy_iadd, /*nb_inplace_add*/
proxy_isub, /*nb_inplace_subtract*/
proxy_imul, /*nb_inplace_multiply*/
Modified: python/branches/py3k/PC/winreg.c
==============================================================================
--- python/branches/py3k/PC/winreg.c (original)
+++ python/branches/py3k/PC/winreg.c Wed Jun 11 22:21:57 2008
@@ -450,12 +450,9 @@
PyHKEY_binaryFailureFunc, /* nb_and */
PyHKEY_binaryFailureFunc, /* nb_xor */
PyHKEY_binaryFailureFunc, /* nb_or */
- 0, /* nb_reserved */
PyHKEY_intFunc, /* nb_int */
PyHKEY_unaryFailureFunc, /* nb_long */
PyHKEY_unaryFailureFunc, /* nb_float */
- PyHKEY_unaryFailureFunc, /* nb_oct */
- PyHKEY_unaryFailureFunc, /* nb_hex */
};
More information about the Python-3000-checkins
mailing list