Fix up upload.py

No more user interaction (this is a replication of a commit originally
made to the master branch)