Python: Modernizes queries

Author: BekaValentine

python/ql/src/Exceptions/IllegalExceptionHandlerType.ql

@@ -13,16 +13,16 @@
 
 import python
 
-from ExceptFlowNode ex, Object t, ClassObject c, ControlFlowNode origin, string what
-where ex.handledException_objectapi(t, c, origin) and 
+from ExceptFlowNode ex, Value t, ClassValue c, ControlFlowNode origin, string what
+where ex.handledException(t, c, origin) and 
 (
-  exists(ClassObject x | x = t |
+  exists(ClassValue x | x = t |
     not x.isLegalExceptionType() and
-    not x.failedInference() and
+    not x.failedInference(_) and
     what = "class '" + x.getName() + "'"
   )
   or
-  not t instanceof ClassObject and
+  not t instanceof ClassValue and
   what = "instance of '" + c.getName() + "'"
 )
 

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

@@ -1,6 +1,6 @@
 
 import python
 
-from ExceptFlowNode ex, Object obj
-where ex.handledException_objectapi(obj, _, _)
-select ex.getLocation().getStartLine(), ex.toString(), obj.toString()
+from ExceptFlowNode ex, Value val
+where ex.handledException(val, _, _)
+select ex.getLocation().getStartLine(), ex.toString(), val.toString()

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

@@ -1,6 +1,6 @@
 
 import python
 
-from ExceptFlowNode ex, Object obj
-where ex.handledException_objectapi(obj, _, _)
-select ex.getLocation().getStartLine(), ex.toString(), obj.toString()
+from ExceptFlowNode ex, Value val
+where ex.handledException(val, _, _)
+select ex.getLocation().getStartLine(), ex.toString(), val.toString()

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

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