(Yet More) Portability

A few small rewrites required to make 1.5.2 code forwards-compatible with 1.6/2.0. These were done well in advance.

Pycheck is a very useful tool when used sensibly.

Always worth reading documents like Kuchling's "What's New In Python" when each new release comes out.