Merge pull request github#2989 from BekaValentine/python-objectapi-to-valueapi-incorrectexceptorder

Python: ObjectAPI to ValueAPI: IncorrectExceptOrder

Author: RasmusWL

python/ql/src/Exceptions/IncorrectExceptOrder.ql

@@ -14,21 +14,21 @@
 
 import python
 
-predicate incorrect_except_order(ExceptStmt ex1, ClassObject cls1, ExceptStmt ex2, ClassObject cls2) {
-   exists(int i, int j, Try t | 
-       ex1 = t.getHandler(i) and
-       ex2 = t.getHandler(j) and i < j and
-       cls1 = except_class(ex1) and
-       cls2 = except_class(ex2) and
-       cls1 = cls2.getASuperType()
-   )
+predicate incorrect_except_order(ExceptStmt ex1, ClassValue cls1, ExceptStmt ex2, ClassValue cls2) {
+    exists(int i, int j, Try t |
+        ex1 = t.getHandler(i) and
+        ex2 = t.getHandler(j) and
+        i < j and
+        cls1 = except_class(ex1) and
+        cls2 = except_class(ex2) and
+        cls1 = cls2.getASuperType()
+    )
 }
 
-ClassObject except_class(ExceptStmt ex) {
-    ex.getType().refersTo(result)
-}
+ClassValue except_class(ExceptStmt ex) { ex.getType().pointsTo(result) }
 
-from ExceptStmt ex1, ClassObject cls1, ExceptStmt ex2, ClassObject cls2
+from ExceptStmt ex1, ClassValue cls1, ExceptStmt ex2, ClassValue cls2
 where incorrect_except_order(ex1, cls1, ex2, cls2)
-select ex2, "Except block for $@ is unreachable; the more general $@ for $@ will always be executed in preference.",
-       cls2, cls2.getName(), ex1, "except block", cls1, cls1.getName()
+select ex2,
+    "Except block for $@ is unreachable; the more general $@ for $@ will always be executed in preference.",
+    cls2, cls2.getName(), ex1, "except block", cls1, cls1.getName()

python/ql/test/query-tests/Exceptions/general/IncorrectExceptOrder.expected

@@ -1 +1 @@
-| exceptions_test.py:64:1:64:22 | ExceptStmt | Except block for $@ is unreachable; the more general $@ for $@ will always be executed in preference. | file://:Compiled Code:0:0:0:0 | builtin-class AttributeError | AttributeError | exceptions_test.py:62:1:62:17 | ExceptStmt | except block | file://:Compiled Code:0:0:0:0 | builtin-class Exception | Exception |
+| exceptions_test.py:64:1:64:22 | ExceptStmt | Except block for $@ is unreachable; the more general $@ for $@ will always be executed in preference. | file://:0:0:0:0 | builtin-class AttributeError | AttributeError | exceptions_test.py:62:1:62:17 | ExceptStmt | except block | file://:0:0:0:0 | builtin-class Exception | Exception |