]> granicus.if.org Git - python/commit
Merged revisions 77292-77293 via svnmerge from
authorBenjamin Peterson <benjamin@python.org>
Mon, 4 Jan 2010 01:10:28 +0000 (01:10 +0000)
committerBenjamin Peterson <benjamin@python.org>
Mon, 4 Jan 2010 01:10:28 +0000 (01:10 +0000)
commitaea4428fdc8a9f1a77ddc1099442ca5db9db7e78
tree3b667c459507fc0c88199bd7eb6b1feded04ec9c
parent66c741f5fbe177d034167e69a658ec261b710f5a
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
Misc/NEWS
Objects/complexobject.c