simplify KeyError raising

timfel · timfel · commit 82789d4d14e0 · 2021-04-22T14:01:54.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/foreign/AccessForeignItemNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/foreign/AccessForeignItemNodes.java
@@ -189,7 +189,7 @@ Object doHashKey(Object object, Object key,
                     throw CompilerDirectives.shouldNotReachHere(e);
                 }
             }
-            throw raise(KeyError, "%s", lib.toDisplayString(key, true));
+            throw raise(KeyError, lib.toDisplayString(key, true));
         }
 
         @Fallback
@@ -292,7 +292,7 @@ Object doHashKey(Object object, Object key, Object value,
                 }
             }
             wrongIndex.enter();
-            throw raise(KeyError, "%s", lib.toDisplayString(key, true));
+            throw raise(KeyError, lib.toDisplayString(key, true));
         }
 
         @Fallback
@@ -372,7 +372,7 @@ Object doHashKey(Object object, Object key,
                     throw CompilerDirectives.shouldNotReachHere(e);
                 }
             }
-            throw raise(KeyError, "%s", lib.toDisplayString(key, true));
+            throw raise(KeyError, lib.toDisplayString(key, true));
         }
 
         @Fallback

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ Object doHashKey(Object object, Object key,`
`189`	`189`	`throw CompilerDirectives.shouldNotReachHere(e);`
`190`	`190`	`}`
`191`	`191`	`}`
`192`		`- throw raise(KeyError, "%s", lib.toDisplayString(key, true));`
	`192`	`+ throw raise(KeyError, lib.toDisplayString(key, true));`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`@Fallback`
`@@ -292,7 +292,7 @@ Object doHashKey(Object object, Object key, Object value,`
`292`	`292`	`}`
`293`	`293`	`}`
`294`	`294`	`wrongIndex.enter();`
`295`		`- throw raise(KeyError, "%s", lib.toDisplayString(key, true));`
	`295`	`+ throw raise(KeyError, lib.toDisplayString(key, true));`
`296`	`296`	`}`
`297`	`297`
`298`	`298`	`@Fallback`
`@@ -372,7 +372,7 @@ Object doHashKey(Object object, Object key,`
`372`	`372`	`throw CompilerDirectives.shouldNotReachHere(e);`
`373`	`373`	`}`
`374`	`374`	`}`
`375`		`- throw raise(KeyError, "%s", lib.toDisplayString(key, true));`
	`375`	`+ throw raise(KeyError, lib.toDisplayString(key, true));`
`376`	`376`	`}`
`377`	`377`
`378`	`378`	`@Fallback`