upload.py: more fixes for py3