From f3ecc33678ecb0cb3edfcbe52afaacd87618c5b6 Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval@gmail.com>
Date: Sat, 17 Aug 2013 17:08:55 +0200
Subject: [PATCH] Fix commit b46a0dd (breaks tests for Alias and Aka).

---
 src/utils/str.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/utils/str.py b/src/utils/str.py
index 86a4c9f56..f423c21c9 100644
--- 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: