[Python-checkins] r82417 - in python/branches/py3k: Lib/test/test_descr.py Misc/NEWS Modules/mathmodule.c

Thu Jul 1 17:16:55 CEST 2010

Author: benjamin.peterson
Date: Thu Jul 1 17:16:55 2010
New Revision: 82417
Log:
correctly lookup __trunc__ and __floor__
Modified:
 python/branches/py3k/Lib/test/test_descr.py
 python/branches/py3k/Misc/NEWS
 python/branches/py3k/Modules/mathmodule.c
Modified: python/branches/py3k/Lib/test/test_descr.py
==============================================================================

--- python/branches/py3k/Lib/test/test_descr.py	(original)
+++ python/branches/py3k/Lib/test/test_descr.py	Thu Jul 1 17:16:55 2010
@@ -1,6 +1,7 @@
 import builtins
 import sys
 import types
+import math
 import unittest
 
 from copy import deepcopy
@@ -1578,6 +1579,8 @@
 ("__exit__", run_context, swallow, set(), {"__enter__" : iden}),
 ("__complex__", complex, complex_num, set(), {}),
 ("__format__", format, format_impl, set(), {}),
+ ("__floor__", math.floor, zero, set(), {}),
+ ("__trunc__", math.trunc, zero, set(), {}),
 ]
 
 class Checker(object):
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Thu Jul 1 17:16:55 2010
@@ -1374,6 +1374,9 @@
 Extension Modules
 -----------------
 
+- In the math module, correctly lookup __trunc__ and __floor__ as special
+ methods.
+
 - Issue #9005: Prevent utctimetuple() from producing year 0 or year
 10,000. Prior to this change, timezone adjustment in utctimetuple()
 could produce tm_year value of 0 or 10,000. Now an OverflowError is
Modified: python/branches/py3k/Modules/mathmodule.c
==============================================================================
--- python/branches/py3k/Modules/mathmodule.c	(original)
+++ python/branches/py3k/Modules/mathmodule.c	Thu Jul 1 17:16:55 2010
@@ -883,17 +883,13 @@
 static PyObject *floor_str = NULL;
 PyObject *method;
 
- if (floor_str == NULL) {
- floor_str = PyUnicode_InternFromString("__floor__");
- if (floor_str == NULL)
+ method = _PyObject_LookupSpecial(number, "__floor__", &floor_str);
+ if (method == NULL) {
+ if (PyErr_Occurred())
 return NULL;
- }
-
- method = _PyType_Lookup(Py_TYPE(number), floor_str);
- if (method == NULL)
 return math_1_to_int(number, floor, 0);
- else
- return PyObject_CallFunction(method, "O", number);
+ }
+ return PyObject_CallFunctionObjArgs(method, NULL);
 }
 
 PyDoc_STRVAR(math_floor_doc,
@@ -1427,20 +1423,15 @@
 return NULL;
 }
 
- if (trunc_str == NULL) {
- trunc_str = PyUnicode_InternFromString("__trunc__");
- if (trunc_str == NULL)
- return NULL;
- }
-
- trunc = _PyType_Lookup(Py_TYPE(number), trunc_str);
+ trunc = _PyObject_LookupSpecial(number, "__trunc__", &trunc_str);
 if (trunc == NULL) {
- PyErr_Format(PyExc_TypeError,
- "type %.100s doesn't define __trunc__ method",
- Py_TYPE(number)->tp_name);
+ if (!PyErr_Occurred())
+ PyErr_Format(PyExc_TypeError,
+ "type %.100s doesn't define __trunc__ method",
+ Py_TYPE(number)->tp_name);
 return NULL;
 }
- return PyObject_CallFunctionObjArgs(trunc, number, NULL);
+ return PyObject_CallFunctionObjArgs(trunc, NULL);
 }
 
 PyDoc_STRVAR(math_trunc_doc,
