Correct automatic URL fixup
Fix urlencoding on Python 2 / Python 3 (Fixes #62)