Return unicode from _safe_str in Python 2.x

Under *Python 2.x*, `_safe_str()` should return `unicode`, otherwise `logger.error(u"The quiæk fåx jømps øver the lazy dåg")` fails in celery's `ColorFormatter`. This is because celery's `ColorFormatter.format()` expects unicode or ascii from `_safe_str()`, not `utf-8`, otherwise `str_t(...)` (`unicode(...)`) fails.

1 files changed, 1 insertions, 1 deletions

diff --git a/kombu/utils/encoding.py b/kombu/utils/encoding.py
index efeeb329..cb84524c 100644
--- a/kombu/utils/encoding.py
+++ b/kombu/utils/encoding.py
@@ -94,7 +94,7 @@ def _safe_str(s, errors='replace'):
     encoding = default_encoding()
     try:
         if isinstance(s, unicode):
-            return s.encode(encoding, errors)
+            return s
         return unicode(s, encoding, errors)
     except Exception, exc:
         return '<Unrepresentable %r: %r %r>' % (