update the deriveds for better unhashable TypeError messages

pjenvey · pjenvey · commit 9f734661e195 · 2008-10-12T22:37:53.000Z
diff --git a/src/org/python/core/PyArrayDerived.java b/src/org/python/core/PyArrayDerived.java
@@ -744,7 +744,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/core/PyBaseExceptionDerived.java b/src/org/python/core/PyBaseExceptionDerived.java
@@ -720,7 +720,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/core/PyBooleanDerived.java b/src/org/python/core/PyBooleanDerived.java
@@ -744,7 +744,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/core/PyClassMethodDerived.java b/src/org/python/core/PyClassMethodDerived.java
@@ -744,7 +744,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/core/PyComplexDerived.java b/src/org/python/core/PyComplexDerived.java
@@ -744,7 +744,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/core/PyDictionaryDerived.java b/src/org/python/core/PyDictionaryDerived.java
@@ -744,7 +744,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/core/PyEnumerateDerived.java b/src/org/python/core/PyEnumerateDerived.java
@@ -744,7 +744,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/core/PyFileDerived.java b/src/org/python/core/PyFileDerived.java
@@ -744,7 +744,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/core/PyFloatDerived.java b/src/org/python/core/PyFloatDerived.java
@@ -744,7 +744,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/core/PyFrozenSetDerived.java b/src/org/python/core/PyFrozenSetDerived.java
@@ -744,7 +744,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/core/PyIntegerDerived.java b/src/org/python/core/PyIntegerDerived.java
@@ -744,7 +744,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/core/PyListDerived.java b/src/org/python/core/PyListDerived.java
@@ -744,7 +744,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/core/PyLongDerived.java b/src/org/python/core/PyLongDerived.java
@@ -744,7 +744,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/core/PyModuleDerived.java b/src/org/python/core/PyModuleDerived.java
@@ -720,7 +720,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/core/PyObjectDerived.java b/src/org/python/core/PyObjectDerived.java
@@ -744,7 +744,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/core/PyPropertyDerived.java b/src/org/python/core/PyPropertyDerived.java
@@ -744,7 +744,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/core/PySetDerived.java b/src/org/python/core/PySetDerived.java
@@ -744,7 +744,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/core/PySliceDerived.java b/src/org/python/core/PySliceDerived.java
@@ -744,7 +744,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/core/PyStringDerived.java b/src/org/python/core/PyStringDerived.java
@@ -744,7 +744,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/core/PySuperDerived.java b/src/org/python/core/PySuperDerived.java
@@ -744,7 +744,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/core/PyTupleDerived.java b/src/org/python/core/PyTupleDerived.java
@@ -744,7 +744,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/core/PyTypeDerived.java b/src/org/python/core/PyTypeDerived.java
@@ -720,7 +720,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/core/PyUnicodeDerived.java b/src/org/python/core/PyUnicodeDerived.java
@@ -744,7 +744,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/modules/_collections/PyDefaultDictDerived.java b/src/org/python/modules/_collections/PyDefaultDictDerived.java
@@ -746,7 +746,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/modules/_collections/PyDequeDerived.java b/src/org/python/modules/_collections/PyDequeDerived.java
@@ -746,7 +746,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/modules/_csv/PyDialectDerived.java b/src/org/python/modules/_csv/PyDialectDerived.java
@@ -722,7 +722,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/modules/_functools/PyPartialDerived.java b/src/org/python/modules/_functools/PyPartialDerived.java
@@ -722,7 +722,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/modules/_weakref/ReferenceTypeDerived.java b/src/org/python/modules/_weakref/ReferenceTypeDerived.java
@@ -746,7 +746,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/modules/random/PyRandomDerived.java b/src/org/python/modules/random/PyRandomDerived.java
@@ -746,7 +746,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/modules/thread/PyLocalDerived.java b/src/org/python/modules/thread/PyLocalDerived.java
@@ -722,7 +722,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }
diff --git a/src/org/python/modules/zipimport/zipimporterDerived.java b/src/org/python/modules/zipimport/zipimporterDerived.java
@@ -722,7 +722,7 @@ public int hashCode() {
             throw Py.TypeError("__hash__ should return a int");
         }
         if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
-            throw Py.TypeError("unhashable type");
+            throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));
         }
         return super.hashCode();
     }

Original file line number	Diff line number	Diff line change
`@@ -744,7 +744,7 @@ public int hashCode() {`
`744`	`744`	`throw Py.TypeError("__hash__ should return a int");`
`745`	`745`	`}`
`746`	`746`	`if (self_type.lookup("__eq__")!=null\|\|self_type.lookup("__cmp__")!=null) {`
`747`		`- throw Py.TypeError("unhashable type");`
	`747`	`+ throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));`
`748`	`748`	`}`
`749`	`749`	`return super.hashCode();`
`750`	`750`	`}`
Original file line number	Diff line number	Diff line change
`@@ -720,7 +720,7 @@ public int hashCode() {`
`720`	`720`	`throw Py.TypeError("__hash__ should return a int");`
`721`	`721`	`}`
`722`	`722`	`if (self_type.lookup("__eq__")!=null\|\|self_type.lookup("__cmp__")!=null) {`
`723`		`- throw Py.TypeError("unhashable type");`
	`723`	`+ throw Py.TypeError(String.format("unhashable type: '%.200s'",getType().fastGetName()));`
`724`	`724`	`}`
`725`	`725`	`return super.hashCode();`
`726`	`726`	`}`