Use unicode(), not str()

Unicode errors can occur on unicode input if
str() is used in Python 2.x. Instead, use unicode()
and allow six to provide this for us in Python 3.

Change-Id: I2ad21a2fb367cecad6d6238a1960e92847583f07