Ignore stderr when checking for upstream
Revert to make work with Python 2.7 which is what is on my system

Revert "Fix syntax and error cleanly on Python-3"

This reverts commit 26b6b225b60a57506115d0a707bded11e5a245ff.