From: <pj...@us...> - 2008-07-21 19:10:06
|
Revision: 4981 http://jython.svn.sourceforge.net/jython/?rev=4981&view=rev Author: pjenvey Date: 2008-07-21 19:10:02 +0000 (Mon, 21 Jul 2008) Log Message: ----------- we want the final seq___finditem__ here Modified Paths: -------------- trunk/jython/src/org/python/core/PySequence.java Modified: trunk/jython/src/org/python/core/PySequence.java =================================================================== --- trunk/jython/src/org/python/core/PySequence.java 2008-07-21 05:00:49 UTC (rev 4980) +++ trunk/jython/src/org/python/core/PySequence.java 2008-07-21 19:10:02 UTC (rev 4981) @@ -143,7 +143,7 @@ if(i < 0) { return (i == -1) ? Py.True : Py.False; } - return __finditem__(i)._lt(o.__finditem__(i)); + return seq___finditem__(i)._lt(((PySequence)o).seq___finditem__(i)); } final synchronized PyObject seq___lt__(PyObject o) { @@ -158,7 +158,7 @@ if(i < 0) { return (i == -1 || i == -2) ? Py.True : Py.False; } - return __finditem__(i)._le(o.__finditem__(i)); + return seq___finditem__(i)._le(((PySequence)o).seq___finditem__(i)); } final synchronized PyObject seq___le__(PyObject o) { @@ -172,7 +172,7 @@ int i = cmp(this, -1, o, -1); if(i < 0) return (i == -3) ? Py.True : Py.False; - return __finditem__(i)._gt(o.__finditem__(i)); + return seq___finditem__(i)._gt(((PySequence)o).seq___finditem__(i)); } final synchronized PyObject seq___gt__(PyObject o) { @@ -187,7 +187,7 @@ if(i < 0) { return (i == -3 || i == -2) ? Py.True : Py.False; } - return __finditem__(i)._ge(o.__finditem__(i)); + return seq___finditem__(i)._ge(((PySequence)o).seq___finditem__(i)); } final synchronized PyObject seq___ge__(PyObject o) { @@ -289,7 +289,7 @@ } final PyObject seq___getitem__(PyObject index) { - PyObject ret = __finditem__(index); + PyObject ret = seq___finditem__(index); if(ret == null) { throw Py.IndexError("index out of range: " + index); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |