Update some of the constants and declarations to post python-2.0
convenience functions, increase related test coverage.
Authored by: kylev 2009-02-15
Parent: [r585]
Child: [r587]
