commit aea4428fdc8a9f1a77ddc1099442ca5db9db7e78
author Benjamin Peterson <benjamin@python.org> Mon Jan 04 01:10:28 2010 +0000
committer Benjamin Peterson <benjamin@python.org> Mon Jan 04 01:10:28 2010 +0000
tree 3b667c459507fc0c88199bd7eb6b1feded04ec9c
parent 66c741f5fbe177d034167e69a658ec261b710f5a

Merged revisions 77292-77293 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77292 | benjamin.peterson | 2010-01-03 18:43:01 -0600 (Sun, 03 Jan 2010) | 1 line

  do correct lookup of the __complex__ method
........
  r77293 | benjamin.peterson | 2010-01-03 19:00:47 -0600 (Sun, 03 Jan 2010) | 1 line

  factor out __complex__ lookup code to fix another case
........

Lib/test/test_descr.py

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index c436eb6..8e45bcf 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -1542,6 +1542,8 @@
             return []
         def zero(self):
             return 0
+        def complex_num(self):
+            return 1j
         def stop(self):
             raise StopIteration
         def return_true(self, thing=None):
@@ -1575,6 +1577,7 @@
              set(("__bases__",)), {}),
             ("__enter__", run_context, iden, set(), {"__exit__" : swallow}),
             ("__exit__", run_context, swallow, set(), {"__enter__" : iden}),
+            ("__complex__", complex, complex_num, set(), {}),
             ]
 
         class Checker(object):