Derived changes for r5529 __cmp__ results

pjenvey · pjenvey · commit 34637aefa4fe · 2008-10-30T06:07:01.000Z
diff --git a/src/org/python/core/PyArrayDerived.java b/src/org/python/core/PyArrayDerived.java
@@ -776,11 +776,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/core/PyBaseExceptionDerived.java b/src/org/python/core/PyBaseExceptionDerived.java
@@ -752,11 +752,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/core/PyBooleanDerived.java b/src/org/python/core/PyBooleanDerived.java
@@ -776,11 +776,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/core/PyClassMethodDerived.java b/src/org/python/core/PyClassMethodDerived.java
@@ -776,11 +776,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/core/PyComplexDerived.java b/src/org/python/core/PyComplexDerived.java
@@ -776,11 +776,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/core/PyDictionaryDerived.java b/src/org/python/core/PyDictionaryDerived.java
@@ -776,11 +776,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/core/PyEnumerateDerived.java b/src/org/python/core/PyEnumerateDerived.java
@@ -776,11 +776,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/core/PyFileDerived.java b/src/org/python/core/PyFileDerived.java
@@ -776,11 +776,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/core/PyFloatDerived.java b/src/org/python/core/PyFloatDerived.java
@@ -776,11 +776,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/core/PyFrozenSetDerived.java b/src/org/python/core/PyFrozenSetDerived.java
@@ -776,11 +776,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/core/PyIntegerDerived.java b/src/org/python/core/PyIntegerDerived.java
@@ -776,11 +776,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/core/PyListDerived.java b/src/org/python/core/PyListDerived.java
@@ -776,11 +776,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/core/PyLongDerived.java b/src/org/python/core/PyLongDerived.java
@@ -776,11 +776,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/core/PyModuleDerived.java b/src/org/python/core/PyModuleDerived.java
@@ -752,11 +752,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/core/PyObjectDerived.java b/src/org/python/core/PyObjectDerived.java
@@ -776,11 +776,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/core/PyPropertyDerived.java b/src/org/python/core/PyPropertyDerived.java
@@ -776,11 +776,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/core/PySetDerived.java b/src/org/python/core/PySetDerived.java
@@ -776,11 +776,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/core/PySliceDerived.java b/src/org/python/core/PySliceDerived.java
@@ -776,11 +776,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/core/PyStringDerived.java b/src/org/python/core/PyStringDerived.java
@@ -776,11 +776,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/core/PySuperDerived.java b/src/org/python/core/PySuperDerived.java
@@ -776,11 +776,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/core/PyTupleDerived.java b/src/org/python/core/PyTupleDerived.java
@@ -776,11 +776,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/core/PyTypeDerived.java b/src/org/python/core/PyTypeDerived.java
@@ -752,11 +752,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/core/PyUnicodeDerived.java b/src/org/python/core/PyUnicodeDerived.java
@@ -776,11 +776,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/modules/_collections/PyDefaultDictDerived.java b/src/org/python/modules/_collections/PyDefaultDictDerived.java
@@ -778,11 +778,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/modules/_collections/PyDequeDerived.java b/src/org/python/modules/_collections/PyDequeDerived.java
@@ -778,11 +778,11 @@ public int __cmp__(PyObject other) {
             return super.__cmp__(other);
         }
         PyObject res=impl.__get__(this,self_type).__call__(other);
-        if (res instanceof PyInteger) {
-            int v=((PyInteger)res).getValue();
-            return v<0?-1:v>0?1:0;
+        if (res==Py.NotImplemented) {
+            return-2;
         }
-        throw Py.TypeError("__cmp__ should return a int");
+        int c=res.asInt();
+        return c<0?-1:c>0?1:0;
     }
 
     public boolean __nonzero__() {
diff --git a/src/org/python/modules/_csv/PyDialectDerived.java b/src/org/python/modules/_csv/PyDialectDerived.java
diff --git a/src/org/python/modules/_functools/PyPartialDerived.java b/src/org/python/modules/_functools/PyPartialDerived.java
diff --git a/src/org/python/modules/_weakref/ReferenceTypeDerived.java b/src/org/python/modules/_weakref/ReferenceTypeDerived.java
diff --git a/src/org/python/modules/random/PyRandomDerived.java b/src/org/python/modules/random/PyRandomDerived.java
diff --git a/src/org/python/modules/thread/PyLocalDerived.java b/src/org/python/modules/thread/PyLocalDerived.java
diff --git a/src/org/python/modules/zipimport/zipimporterDerived.java b/src/org/python/modules/zipimport/zipimporterDerived.java

Original file line number	Diff line number	Diff line change
`@@ -776,11 +776,11 @@ public int __cmp__(PyObject other) {`
`776`	`776`	`return super.__cmp__(other);`
`777`	`777`	`}`
`778`	`778`	`PyObject res=impl.__get__(this,self_type).__call__(other);`
`779`		`- if (res instanceof PyInteger) {`
`780`		`- int v=((PyInteger)res).getValue();`
`781`		`- return v<0?-1:v>0?1:0;`
	`779`	`+ if (res==Py.NotImplemented) {`
	`780`	`+ return-2;`
`782`	`781`	`}`
`783`		`- throw Py.TypeError("__cmp__ should return a int");`
	`782`	`+ int c=res.asInt();`
	`783`	`+ return c<0?-1:c>0?1:0;`
`784`	`784`	`}`
`785`	`785`
`786`	`786`	`public boolean __nonzero__() {`
Original file line number	Diff line number	Diff line change
`@@ -752,11 +752,11 @@ public int __cmp__(PyObject other) {`
`752`	`752`	`return super.__cmp__(other);`
`753`	`753`	`}`
`754`	`754`	`PyObject res=impl.__get__(this,self_type).__call__(other);`
`755`		`- if (res instanceof PyInteger) {`
`756`		`- int v=((PyInteger)res).getValue();`
`757`		`- return v<0?-1:v>0?1:0;`
	`755`	`+ if (res==Py.NotImplemented) {`
	`756`	`+ return-2;`
`758`	`757`	`}`
`759`		`- throw Py.TypeError("__cmp__ should return a int");`
	`758`	`+ int c=res.asInt();`
	`759`	`+ return c<0?-1:c>0?1:0;`
`760`	`760`	`}`
`761`	`761`
`762`	`762`	`public boolean __nonzero__() {`