Use unicode() directly to decode an object.

moriyoshi · moriyoshi · commit c53bcde5cced · 2013-08-15T12:01:05.000+09:00
diff --git a/fluent/handler.py b/fluent/handler.py
@@ -63,12 +63,19 @@ def _build_structure(self, record):
     def _decode(self, value):
         if value is None:
             return None
-        elif isinstance(value, str):
-            return unicode(value, self.encoding, errors='replace')
         elif isinstance(value, unicode):
             return value
+        elif isinstance(value, basestring):
+            return unicode(value, self.encoding, errors='replace')
         else:
-            return self._decode(str(value))
+            try:
+                return getattr(value, '__unicode__', None)()
+            except:
+                pass
+            try:
+                return self._decode(unicode(value))
+            except (TypeError, UnicodeDecodeError):
+                return self._decode(str(value).encode('string_escape'))
 
     def _fsdecode(self, value):
         if value is None:
@@ -94,7 +101,7 @@ def _format_exception(self, exc_info):
         if exc_info is not None and exc_info[0] is not None:
             return {
                 'type': exc_info[0].__name__,
-                'value': [self._decode(str(arg)) for arg in exc_info[1].args],
+                'value': [self._decode(arg) for arg in exc_info[1].args],
                 'traceback': traceback.extract_tb(exc_info[2])
                 }
         else:
diff --git a/tests/test_decode.py b/tests/test_decode.py
@@ -43,3 +43,23 @@ def test_decode_obj(self):
         self.assertTrue(isinstance(result, unicode), type(result).__name__)
         
         self.assertEqual(result, str(marker))
+
+    def test_decode_more(self):
+        handler = self._makeOne('app.follow', encoding='ascii')
+        self.assertEqual(handler._decode('a'), u'a')
+        self.assertEqual(handler._decode(u'\u2600'), u'\u2600')
+        self.assertEqual(handler._decode([1, 2, '3']), u"[1, 2, '3']")
+        self.assertEqual(handler._decode((1, 2, [3])), u"(1, 2, [3])")
+        self.assertEqual(handler._decode({'a': u'\u2600', 'c': [1, 2, {'c': 'd'}]}), u"{'a': u'\\u2600', 'c': [1, 2, {'c': 'd'}]}")
+
+        class Something(object):
+            def __unicode__(self):
+                return u'123'
+
+        self.assertEqual(handler._decode(Something()), u'123')
+
+        class Something(object):
+            def __str__(self):
+                return '\xe3\x98\x80'
+
+        self.assertEqual(handler._decode(Something()), u'\\xe3\\x98\\x80')
