got the logic wrong due to odd naming w.r.t. six
Fixed many SyntaxErrors on Python 3 due to unicode literals (except testsuite)

--HG--
extra : source : 6792016d1e9a671313b8c3ae9bceb39957d2a370