Python: Moves predicates over to suffixed form

Author: BekaValentine

python/ql/src/Exceptions/IllegalExceptionHandlerType.ql

@@ -14,7 +14,7 @@
 import python
 
 from ExceptFlowNode ex, Object t, ClassObject c, ControlFlowNode origin, string what
-where ex.handledException(t, c, origin) and 
+where ex.handledException_objectapi(t, c, origin) and 
 (
   exists(ClassObject x | x = t |
     not x.isLegalExceptionType() and

python/ql/src/semmle/python/types/Exceptions.qll

@@ -271,7 +271,7 @@ class ExceptFlowNode extends ControlFlowNode {
 
     /** Gets the inferred type(s) that are handled by this node, splitting tuples if possible. */
     pragma [noinline]
-    predicate handledException(Object obj, ClassObject cls, ControlFlowNode origin) {
+    predicate handledException_objectapi(Object obj, ClassObject cls, ControlFlowNode origin) {
         this.handledObject(obj, cls, origin) and not cls = theTupleType()
         or
         not exists(this.getNode().(ExceptStmt).getType()) and obj = theBaseExceptionType() and cls = theTypeType() and
@@ -281,7 +281,7 @@ class ExceptFlowNode extends ControlFlowNode {
     /** Whether this `except` handles `cls` */
     predicate handles(ClassObject cls) {
         exists(ClassObject handled |
-            this.handledException(handled, _, _) |
+            this.handledException_objectapi(handled, _, _) |
             cls.getAnImproperSuperType() = handled
         )
     }

python/ql/test/2/library-tests/ControlFlow/Exceptions/Handles.ql

@@ -2,5 +2,5 @@
 import python
 
 from ExceptFlowNode ex, Object obj
-where ex.handledException(obj, _, _)
+where ex.handledException_objectapi(obj, _, _)
 select ex.getLocation().getStartLine(), ex.toString(), obj.toString()

python/ql/test/3/library-tests/ControlFlow/Exceptions/Handles.ql

@@ -2,5 +2,5 @@
 import python
 
 from ExceptFlowNode ex, Object obj
-where ex.handledException(obj, _, _)
+where ex.handledException_objectapi(obj, _, _)
 select ex.getLocation().getStartLine(), ex.toString(), obj.toString()

python/ql/test/library-tests/exceptions/Handles.ql

@@ -1,5 +1,5 @@
 import python
 
 from ExceptFlowNode ex, Object t
-where ex.handledException(t,  _, _)
+where ex.handledException_objectapi(t,  _, _)
 select ex.getLocation().getStartLine(), ex.toString(), t.toString()