[pypy-svn] r75639 - in pypy/branch/fast-forward/pypy/module/exceptions: . test

[benjamin at codespeak.net]

Author: benjamin
Date: Mon Jun 28 18:15:08 2010
New Revision: 75639

Modified:
   pypy/branch/fast-forward/pypy/module/exceptions/interp_exceptions.py
   pypy/branch/fast-forward/pypy/module/exceptions/test/test_exc.py
Log:
add workaround for unicode message

Modified: pypy/branch/fast-forward/pypy/module/exceptions/interp_exceptions.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/exceptions/interp_exceptions.py	(original)
+++ pypy/branch/fast-forward/pypy/module/exceptions/interp_exceptions.py	Mon Jun 28 18:15:08 2010
@@ -117,6 +117,22 @@
             return space.str(space.newtuple(self.args_w))
     descr_str.unwrap_spec = ['self', ObjSpace]
 
+    def descr_unicode(self, space):
+        w_str = space.lookup(self, "__str__")
+        w_base_str = space.wrap(W_BaseException.typedef.rawdict["__str__"])
+        if not space.is_w(w_str, w_base_str):
+            w_as_str = space.get_and_call_function(w_str, space.wrap(self))
+            return space.call_function(space.w_unicode, w_as_str)
+        lgt = len(self.args_w)
+        if lgt == 0:
+            return space.wrap(u"")
+        if lgt == 1:
+            return space.call_function(space.w_unicode, self.args_w[0])
+        else:
+            w_tup = space.newtuple(self.args_w)
+            return space.call_function(space.w_unicode, w_tup)
+    descr_unicode.unwrap_spec = ['self', ObjSpace]
+
     def descr_repr(self, space):
         if self.args_w:
             args_repr = space.str_w(space.repr(space.newtuple(self.args_w)))
@@ -202,6 +218,7 @@
     __new__ = _new(W_BaseException),
     __init__ = interp2app(W_BaseException.descr_init),
     __str__ = interp2app(W_BaseException.descr_str),
+    __unicode__ = interp2app(W_BaseException.descr_unicode),
     __repr__ = interp2app(W_BaseException.descr_repr),
     __dict__ = GetSetProperty(descr_get_dict, descr_set_dict, descr_del_dict,
                               cls=W_BaseException),

Modified: pypy/branch/fast-forward/pypy/module/exceptions/test/test_exc.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/exceptions/test/test_exc.py	(original)
+++ pypy/branch/fast-forward/pypy/module/exceptions/test/test_exc.py	Mon Jun 28 18:15:08 2010
@@ -34,6 +34,14 @@
         del x.message
         assert not hasattr(x, "message")
 
+    def test_unicode_message(self):
+        assert unicode(Exception(u"\xe1")) == u"\xe1"
+        class E(BaseException):
+            def __str__(self):
+                return u"\xe1"
+        e = E()
+        assert unicode(e) == u"\xe1"
+
     def test_kwargs(self):
         from exceptions import Exception
         class X(Exception):