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

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

Revision: 6933
          http://jython.svn.sourceforge.net/jython/?rev=6933&view=rev
Author:   pjenvey
Date:     2009-10-30 01:34:16 +0000 (Fri, 30 Oct 2009)

Log Message:
-----------
correct the numeric check on the right side

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

Modified: trunk/jython/Lib/test/test_builtin_jy.py
===================================================================
--- trunk/jython/Lib/test/test_builtin_jy.py	2009-10-29 07:19:33 UTC (rev 6932)
+++ trunk/jython/Lib/test/test_builtin_jy.py	2009-10-30 01:34:16 UTC (rev 6933)
@@ -29,6 +29,7 @@
         # http://bugs.jython.org/issue1449
         for numeric in 1, 2L, 3.0, 4j:
             self.assertTrue(numeric < Ellipsis)
+            self.assertTrue(Ellipsis > numeric)
 
 class LoopTest(unittest.TestCase):
 

Modified: trunk/jython/src/org/python/core/PyObject.java
===================================================================
--- trunk/jython/src/org/python/core/PyObject.java	2009-10-29 07:19:33 UTC (rev 6932)
+++ trunk/jython/src/org/python/core/PyObject.java	2009-10-30 01:34:16 UTC (rev 6933)
@@ -1321,7 +1321,7 @@
 
         // different type: compare type names; numbers are smaller
         String typeName = isNumberType() ? "" : type.fastGetName();
-        String otherTypeName = otherType.isNumberType() ? "" : otherType.fastGetName();
+        String otherTypeName = other.isNumberType() ? "" : otherType.fastGetName();
         result = typeName.compareTo(otherTypeName);
         if (result == 0) {
             // Same type name, or (more likely) incomparable numeric types


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