typo checking PY_VERSION
merge conflict from pull request; unicode handling