apply part of 400594f7a2 not related to python 2/3 compatibility
Look, using requests n... OH SHIT, A BUG! CURSE YOU, PYTHON 2.X!!!
Mo codecs, mo problems.
Added six & now it works in py2 & py3!