Merge pull request #3323 from MrLeeh/patch-2

BUG : fixes py3k unicode issues

Replaced unicode() function by six.text_type