Add more py2 compatibility imports, not sure they're *required*, but
they're correct.
Authored by: klaussfreire 2013-03-29
Parent: [r13609]
Child: [r13611]