Revert py3 stuff, not ready yet for trunk, so we'll do it in
branches/py3
Authored by: klaussfreire 2013-02-23
Parent: [r13509]
Child: [r13511]