fix error when running with py3k
Merge branch 'py3k' into travis-py3k