From e3acc03fd645f63e168c6efbb52e65bd656ce076 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Sat, 17 Aug 2013 19:27:52 +0200 Subject: [PATCH] Another fix for b46a0dd6a2. --- 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 f423c21c9..8e8418f31 100644 --- a/src/utils/str.py +++ b/src/utils/str.py @@ -454,10 +454,7 @@ def format(s, *args, **kwargs): elif sys.version_info[0] < 3 and isinstance(token, unicode): return token.encode('utf8', 'replace') else: - if sys.version_info[0] < 3: - return str(token).decode('utf-8','replace') - else: - return str(token) + return str(token) elif char == 'i': # XXX Improve me! return str(args.pop())