mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-28 03:13:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 71627 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71627 | benjamin.peterson | 2009-04-15 16:26:36 -0500 (Wed, 15 Apr 2009) | 4 lines

  call __float__ on str subclasses #5759

  tests by R. David Murray
........
This commit is contained in:
Benjamin Peterson 2009-04-15 21:46:14 +00:00
parent 8b18e2853b
commit c843a4765a
3 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/test/test_float.py
View file

@ -82,11 +82,23 @@ class GeneralFloatCases(unittest.TestCase):
def __float__(self): def __float__(self):
return 42 return 42
# Issue 5759: __float__ not called on str subclasses (though it is on
# unicode subclasses).
class FooStr(str):
def __float__(self):
return float(str(self)) + 1
class FooUnicode(unicode):
def __float__(self):
return float(unicode(self)) + 1
self.assertAlmostEqual(float(Foo0()), 42.) self.assertAlmostEqual(float(Foo0()), 42.)
self.assertAlmostEqual(float(Foo1()), 42.) self.assertAlmostEqual(float(Foo1()), 42.)
self.assertAlmostEqual(float(Foo2()), 42.) self.assertAlmostEqual(float(Foo2()), 42.)
self.assertAlmostEqual(float(Foo3(21)), 42.) self.assertAlmostEqual(float(Foo3(21)), 42.)
self.assertRaises(TypeError, float, Foo4(42)) self.assertRaises(TypeError, float, Foo4(42))
self.assertAlmostEqual(float(FooUnicode('8')), 9.)
self.assertAlmostEqual(float(FooStr('8')), 9.)
def test_floatasratio(self): def test_floatasratio(self):
for f, ratio in [ for f, ratio in [

9
Misc/NEWS
View file

@ -4,10 +4,15 @@ Python News
(editors: check NEWS.help for information about editing NEWS using ReST.) (editors: check NEWS.help for information about editing NEWS using ReST.)
What's New in Python 2.6.2 What's New in Python 2.6.3
========================== ==========================
*Release date: 14-Apr-2009* *Release date: XX-XX-XXX*
Core and Builtins
-----------------
- Issue #5759: float() didn't call __float__ on str subclasses.
What's New in Python 2.6.2 rc 1 What's New in Python 2.6.2 rc 1

4
Objects/floatobject.c
View file

@ -1630,7 +1630,9 @@ float_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
return float_subtype_new(type, args, kwds); /* Wimp out */ return float_subtype_new(type, args, kwds); /* Wimp out */
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:float", kwlist, &x)) if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:float", kwlist, &x))
return NULL; return NULL;
if (PyString_Check(x)) /* If it's a string, but not a string subclass, use
PyFloat_FromString. */
if (PyString_CheckExact(x))
return PyFloat_FromString(x, NULL); return PyFloat_FromString(x, NULL);
return PyNumber_Float(x); return PyNumber_Float(x);
} }