Fix attempt for unicode bug #1137 **PYTHON 2 ONLY**

This should probably be made to work on Python 3 first... I see nothing in six.py to help, though.