From: <pj...@us...> - 2010-04-09 04:40:58
|
Revision: 7008 http://jython.svn.sourceforge.net/jython/?rev=7008&view=rev Author: pjenvey Date: 2010-04-09 04:40:52 +0000 (Fri, 09 Apr 2010) Log Message: ----------- accommodate __long__ returning an int Modified Paths: -------------- trunk/jython/src/org/python/core/PyObject.java Modified: trunk/jython/src/org/python/core/PyObject.java =================================================================== --- trunk/jython/src/org/python/core/PyObject.java 2010-04-09 03:21:55 UTC (rev 7007) +++ trunk/jython/src/org/python/core/PyObject.java 2010-04-09 04:40:52 UTC (rev 7008) @@ -4054,7 +4054,7 @@ } throw pye; } - if (!(longObj instanceof PyLong)) { + if (!(longObj instanceof PyLong || longObj instanceof PyInteger)) { // Shouldn't happen except with buggy builtin types throw Py.TypeError("integer conversion failed"); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |