Fix a bug with encoding in Python 3 which was exposed by previous commit.

In Python 3, binascii.hexlify returns bytes, but we want a str.
5 files changed