Merge pull request github#3032 from BekaValentine/python-objectapi-to-valueapi-signatureoverriddenmethod

Python: ObjectAPI to ValueAPI: SignatureOverriddenMethod

Author: tausbn

python/ql/src/Functions/SignatureOverriddenMethod.ql

@@ -14,17 +14,17 @@
 import python
 import Expressions.CallArgs
 
-from FunctionObject base, PyFunctionObject derived
+from FunctionValue base, PythonFunctionValue derived
 where
     not exists(base.getACall()) and
-    not exists(FunctionObject a_derived |
+    not exists(FunctionValue a_derived |
         a_derived.overrides(base) and
         exists(a_derived.getACall())
     ) and
-    not derived.getFunction().isSpecialMethod() and
+    not derived.getScope().isSpecialMethod() and
     derived.getName() != "__init__" and
     derived.isNormalMethod() and
-    not derived.getFunction().isSpecialMethod() and
+    not derived.getScope().isSpecialMethod() and
     // call to overrides distributed for efficiency
     (
         derived.overrides(base) and derived.minParameters() > base.maxParameters()

python/ql/test/query-tests/Functions/general/SignatureOverriddenMethod.expected

@@ -1,2 +1,2 @@
-| om_test.py:32:5:32:35 | Function grossly_wrong1 | Overriding method 'grossly_wrong1' has signature mismatch with $@. | om_test.py:12:5:12:41 | Function grossly_wrong1 | overridden method |
-| om_test.py:35:5:35:47 | Function grossly_wrong2 | Overriding method 'grossly_wrong2' has signature mismatch with $@. | om_test.py:15:5:15:41 | Function grossly_wrong2 | overridden method |
+| om_test.py:32:5:32:35 | Function Derived.grossly_wrong1 | Overriding method 'grossly_wrong1' has signature mismatch with $@. | om_test.py:12:5:12:41 | Function Base.grossly_wrong1 | overridden method |
+| om_test.py:35:5:35:47 | Function Derived.grossly_wrong2 | Overriding method 'grossly_wrong2' has signature mismatch with $@. | om_test.py:15:5:15:41 | Function Base.grossly_wrong2 | overridden method |

python/ql/test/query-tests/Functions/overriding/SignatureOverriddenMethod.expected

@@ -1 +1 @@
-| test.py:30:5:30:26 | Function meth3 | Overriding method 'meth3' has signature mismatch with $@. | test.py:11:5:11:20 | Function meth3 | overridden method |
+| test.py:30:5:30:26 | Function Derived.meth3 | Overriding method 'meth3' has signature mismatch with $@. | test.py:11:5:11:20 | Function Base.meth3 | overridden method |