[merge] python 2.5 fixes

[James Henstridge]

On 26/09/06, John Arbash Meinel <john at arbash-meinel.com> wrote:
> And their functions are at different locations.
> >>> id(cElementTree.ElementTree._write)
> -1211101316
> >>> id(elementtree.ElementTree.ElementTree._write)
> -1210676492

Note that the above test doesn't actually prove anything:
  >>> write1 = cElementTree.ElementTree._write
  >>> write2 = cElementTree.ElementTree._write
  >>> id(write1) == id(write2)
  False

This is because the expression "cElementTree.ElementTree._write"
returns an unbound method object, which is created on request.

In fact, your original test could easily give the same result for both
the cElementTree and ElementTree unbound methods.  The lesson here
being that id() only uniquely identifies an object for the life of
that object -- you can have two objects with the same id() provided
they don't exist at the same time.

You were correct about the two ElementTree classes being different thoug ...

James.