Merged revisions 69451 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r69451 | benjamin.peterson | 2009-02-08 15:07:20 -0600 (Sun, 08 Feb 2009) | 1 line

  fix len() when __len__() returns a non number type #5137
........

diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index 0aa0d527a22417e3ab474056ecf106f55994dba5..a62e1244c2d632abd8172aaa04b4f43bcb3ed59b 100644 (file)
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -611,6 +611,18 @@ class BuiltinTest(unittest.TestCase):
             def __len__(self):
                 raise ValueError
         self.assertRaises(ValueError, len, BadSeq())
+        class InvalidLen:
+            def __len__(self):
+                return None
+        self.assertRaises(TypeError, len, InvalidLen())
+        class FloatLen:
+            def __len__(self):
+                return 4.5
+        self.assertRaises(TypeError, len, FloatLen())
+        class HugeLen:
+            def __len__(self):
+                return sys.maxsize + 1
+        self.assertRaises(OverflowError, len, HugeLen())
 
     def test_map(self):
         self.assertEqual(

diff --git a/Misc/NEWS b/Misc/NEWS
index 7267172ba4c13557f30a569e0e4b175f1beaf7a6..b737e98a567ca0762219cd6e6f99638a26dcac6a 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 3.0.1?
 Core and Builtins
 -----------------
 
+- Issue #5137: Make len() correctly raise a TypeError when a __len__ method
+  returns a non-number type.
+
 - Issue #5182: Removed memoryview.__str__.
 
 - Issue #1717: Removed builtin cmp() function, dropped tp_compare

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index d03a958a2f2b2c931f67597803b5e695ed947f12..da5df518a6c34b8fe8bd71cc9eb0be95ec328c5b 100644 (file)
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -4618,7 +4618,7 @@ slot_sq_length(PyObject *self)
 
        if (res == NULL)
                return -1;
-       len = PyLong_AsSsize_t(res);
+       len = PyNumber_AsSsize_t(res, PyExc_OverflowError);
        Py_DECREF(res);
        if (len < 0) {
                if (!PyErr_Occurred())