Port to dual python2/python3 compat

This commit is contained in:
Toshio Kuratomi 2016-05-10 21:58:22 -07:00 committed by Matt Clay
commit 93fe022aa4