[merge] python 2.5 fixes

[James Henstridge]

On 22/09/06, Martin Pool <mbp at canonical.com> wrote:
> Here's an updated patch including some (much) earlier work.
>
> This also fixes a missing import of TestSkipped.
>
> I'm +1 on merging Marien's ElementTree fixes too -- my python2.5 install
> doesn't have celementtree.

The ElementTree module was renamed to xml.etree.ElementTree when
merged into Python 2.5.  Are you sure it wasn't available?

James.