Import changes to support both Python 2 and 3.
Authored by: bugman 2012-09-28
Parent: [r188]
Child: [r190]