Merged revisions 59193-59201 via svnmerge from

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

........
  r59195 | facundo.batista | 2007-11-27 19:50:12 +0100 (Tue, 27 Nov 2007) | 4 lines


  Moved the errno import from inside the functions to the
  module level.  Fixes issue 1755179.
........
  r59199 | christian.heimes | 2007-11-27 22:28:40 +0100 (Tue, 27 Nov 2007) | 1 line

  Backport of changes to PCbuild9 from the py3k branch
........
  r59200 | christian.heimes | 2007-11-27 22:34:01 +0100 (Tue, 27 Nov 2007) | 1 line

  Replaced import of the 'new' module with 'types' module and added a deprecation warning to the 'new' module.
........
  r59201 | christian.heimes | 2007-11-27 22:35:44 +0100 (Tue, 27 Nov 2007) | 1 line

  Added a deprecation warning to the 'new' module.
........
This commit is contained in:
Christian Heimes 2007-11-27 21:50:00 +00:00
parent 1c280ab7d6
commit 45f9af34b3
11 changed files with 56 additions and 85 deletions

View file

@ -105,11 +105,11 @@ if f2.a.one != f1.a.one != F.a.one != 11:
raise TestFailed
# __func__ may not be a Python method!
import new
import types
F.id = id
eff = F()
eff.id = new.instancemethod(id, eff)
eff.id = types.MethodType(id, eff)
if eff.id() != id(eff):
raise TestFailed