Fix commit b46a0dd (breaks tests for Alias and Aka).

2013-08-17 17:08:55 +02:00 · 2013-08-17 17:08:55 +02:00 · f3ecc33678
parent dfdc7f1cd1
commit f3ecc33678
1 changed files with 1 additions and 4 deletions
--- a/src/utils/str.py
+++ b/src/utils/str.py
@ -450,10 +450,7 @@ def format(s, *args, **kwargs):
        if char == 's':
            token = args.pop()
            if isinstance(token, str):
-                if sys.version_info[0] < 3:
-                    return token.decode('utf-8','replace')
-                else:
-                    return token
+                return token
            elif sys.version_info[0] < 3 and isinstance(token, unicode):
                return token.encode('utf8', 'replace')
            else: