From c2443f2342a20a0abd04f51be57b40d694b51e4b Mon Sep 17 00:00:00 2001 From: Rebecca Valentine Date: Tue, 7 Apr 2020 21:31:35 -0700 Subject: [PATCH] Python: ObjectAPI to ValueAPI: OverlyComplexDelMethod: Adds preliminary modernization --- python/ql/src/Functions/OverlyComplexDelMethod.ql | 6 +++--- .../Functions/general/OverlyComplexDelMethod.expected | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python/ql/src/Functions/OverlyComplexDelMethod.ql b/python/ql/src/Functions/OverlyComplexDelMethod.ql index 2503f7ac6a7..b709af7fb11 100644 --- a/python/ql/src/Functions/OverlyComplexDelMethod.ql +++ b/python/ql/src/Functions/OverlyComplexDelMethod.ql @@ -15,10 +15,10 @@ import python -from FunctionObject method +from FunctionValue method where - exists(ClassObject c | + exists(ClassValue c | c.declaredAttribute("__del__") = method and - method.getFunction().getMetrics().getCyclomaticComplexity() > 3 + method.getScope().getMetrics().getCyclomaticComplexity() > 3 ) select method, "Overly complex '__del__' method." diff --git a/python/ql/test/query-tests/Functions/general/OverlyComplexDelMethod.expected b/python/ql/test/query-tests/Functions/general/OverlyComplexDelMethod.expected index 84c08d89426..2eff178d972 100644 --- a/python/ql/test/query-tests/Functions/general/OverlyComplexDelMethod.expected +++ b/python/ql/test/query-tests/Functions/general/OverlyComplexDelMethod.expected @@ -1 +1 @@ -| protocols.py:74:5:74:22 | Function __del__ | Overly complex '__del__' method. | +| protocols.py:74:5:74:22 | Function MegaDel.__del__ | Overly complex '__del__' method. |