From 47421a63a48954cdcecb214d7a436f76e8e6cdb2 Mon Sep 17 00:00:00 2001 From: Taus Date: Wed, 25 Feb 2026 16:36:52 +0000 Subject: [PATCH] Python: Port import metrics queries --- python/ql/src/Metrics/DirectImports.ql | 8 ++++---- python/ql/src/Metrics/TransitiveImports.ql | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/python/ql/src/Metrics/DirectImports.ql b/python/ql/src/Metrics/DirectImports.ql index e383d4b3657..c4d03232239 100644 --- a/python/ql/src/Metrics/DirectImports.ql +++ b/python/ql/src/Metrics/DirectImports.ql @@ -11,8 +11,8 @@ */ import python -private import LegacyPointsTo +private import semmle.python.dataflow.new.internal.ImportResolution -from ModuleValue m, int n -where n = count(ModuleValue imp | imp = m.getAnImportedModule()) -select m.getScope(), n +from Module m, int n +where n = count(Module imp | ImportResolution::imports(m, imp)) +select m, n diff --git a/python/ql/src/Metrics/TransitiveImports.ql b/python/ql/src/Metrics/TransitiveImports.ql index 364840fbcb9..2e909fa4cf7 100644 --- a/python/ql/src/Metrics/TransitiveImports.ql +++ b/python/ql/src/Metrics/TransitiveImports.ql @@ -11,8 +11,8 @@ */ import python -private import LegacyPointsTo +private import semmle.python.dataflow.new.internal.ImportResolution -from ModuleValue m, int n -where n = count(ModuleValue imp | imp = m.getAnImportedModule+() and imp != m) -select m.getScope(), n +from Module m, int n +where n = count(Module imp | ImportResolution::imports+(m, imp) and imp != m) +select m, n