replaced u"" with six.u("") in several places for #308