[Jython-checkins] SF.net SVN: jython: [4317] trunk/jython

[<pj...@us...>]

Revision: 4317
          http://jython.svn.sourceforge.net/jython/?rev=4317&view=rev
Author:   pjenvey
Date:     2008-04-07 15:19:59 -0700 (Mon, 07 Apr 2008)

Log Message:
-----------
disable Exception.message until 2.5: Exception.__init__ must set it via
__setattr__ which has the potential for breaking < 2.5 Exception
subclasses. it's ready to go on the pep352 branch

Modified Paths:
--------------
    trunk/jython/Lib/test/test_defaultdict.py
    trunk/jython/src/org/python/core/exceptions.java

Modified: trunk/jython/Lib/test/test_defaultdict.py
===================================================================
--- trunk/jython/Lib/test/test_defaultdict.py	2008-04-07 19:47:42 UTC (rev 4316)
+++ trunk/jython/Lib/test/test_defaultdict.py	2008-04-07 22:19:59 UTC (rev 4317)
@@ -137,7 +137,9 @@
         try:
             d1[(1,)]
         except KeyError, err:
-            self.assertEqual(err.message, (1,))
+            # XXX: Exception.message is only supported in CPython 2.5
+            #self.assertEqual(err.message, (1,))
+            pass
         else:
             self.fail("expected KeyError")
 

Modified: trunk/jython/src/org/python/core/exceptions.java
===================================================================
--- trunk/jython/src/org/python/core/exceptions.java	2008-04-07 19:47:42 UTC (rev 4316)
+++ trunk/jython/src/org/python/core/exceptions.java	2008-04-07 22:19:59 UTC (rev 4317)
@@ -274,9 +274,6 @@
         PyObject self = ap.getPyObject(0);
         PyObject args = ap.getList(1);
         
-        if (arg.length == 2) {
-            self.__setattr__("message", ap.getPyObject(1));
-        }
         self.__setattr__("args", args);
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.