Python: Fix library tests

tausbn · tausbn · commit 7176898503e0 · 2025-11-26T12:30:31.000Z
diff --git a/python/ql/test/library-tests/PointsTo/api/ClassValue.ql b/python/ql/test/library-tests/PointsTo/api/ClassValue.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassValue cls, string description
 where
diff --git a/python/ql/test/library-tests/PointsTo/api/Constants.ql b/python/ql/test/library-tests/PointsTo/api/Constants.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from string txt, Value val
 where
diff --git a/python/ql/test/library-tests/PointsTo/api/QualifedNames.ql b/python/ql/test/library-tests/PointsTo/api/QualifedNames.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from FunctionValue v, string name
 where
diff --git a/python/ql/test/library-tests/PointsTo/api/Value.ql b/python/ql/test/library-tests/PointsTo/api/Value.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from Value val, string name
 where
diff --git a/python/ql/test/library-tests/PointsTo/calls/GetACall.ql b/python/ql/test/library-tests/PointsTo/calls/GetACall.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ControlFlowNode call, Value func
 where call = func.getACall()
diff --git a/python/ql/test/library-tests/PointsTo/calls/getArgumentForCall.ql b/python/ql/test/library-tests/PointsTo/calls/getArgumentForCall.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from CallNode call, CallableValue callable, int i
 select call.getLocation().getStartLine(), call.toString(), callable.toString(), i,
diff --git a/python/ql/test/library-tests/PointsTo/calls/getNamedArgumentForCall.ql b/python/ql/test/library-tests/PointsTo/calls/getNamedArgumentForCall.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from CallNode call, CallableValue callable, string name
 select call.getLocation().getStartLine(), call.toString(), callable.toString(), name,
diff --git a/python/ql/test/library-tests/PointsTo/calls/getParameter.ql b/python/ql/test/library-tests/PointsTo/calls/getParameter.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from CallableValue callable, int i
 select callable.toString(), i, callable.getParameter(i).toString()
diff --git a/python/ql/test/library-tests/PointsTo/calls/getParameterByName.ql b/python/ql/test/library-tests/PointsTo/calls/getParameterByName.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from CallableValue callable, string name
 select callable.toString(), name, callable.getParameterByName(name).toString()
diff --git a/python/ql/test/library-tests/PointsTo/decorators/Values.ql b/python/ql/test/library-tests/PointsTo/decorators/Values.ql
@@ -1,6 +1,5 @@
 import python
-import semmle.python.pointsto.PointsTo
-import semmle.python.objects.ObjectInternal
+private import LegacyPointsTo
 
 from NameNode f, Context ctx, ObjectInternal v
 where
diff --git a/python/ql/test/library-tests/PointsTo/functions/Calls.ql b/python/ql/test/library-tests/PointsTo/functions/Calls.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from CallNode call, FunctionObject func, string kind
 where
diff --git a/python/ql/test/library-tests/PointsTo/functions/NeverReturns.ql b/python/ql/test/library-tests/PointsTo/functions/NeverReturns.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from FunctionObject f
 where f.neverReturns()
diff --git a/python/ql/test/library-tests/PointsTo/functions/test.ql b/python/ql/test/library-tests/PointsTo/functions/test.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from Call c, FunctionObject f
 where
diff --git a/python/ql/test/library-tests/PointsTo/general/Util.qll b/python/ql/test/library-tests/PointsTo/general/Util.qll
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 string repr(Object o) {
   not o instanceof StringObject and not o = theBoundMethodType() and result = o.toString()
diff --git a/python/ql/test/library-tests/PointsTo/global/Global.ql b/python/ql/test/library-tests/PointsTo/global/Global.ql
@@ -1,7 +1,5 @@
 import python
-import semmle.python.pointsto.PointsTo
-import semmle.python.pointsto.PointsToContext
-import semmle.python.objects.ObjectInternal
+private import LegacyPointsTo
 
 from ControlFlowNode f, PointsToContext ctx, Value obj, ControlFlowNode orig
 where
diff --git a/python/ql/test/library-tests/PointsTo/inheritance/BaseTypes.ql b/python/ql/test/library-tests/PointsTo/inheritance/BaseTypes.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, ClassObject base, int n
 where
diff --git a/python/ql/test/library-tests/PointsTo/inheritance/Calls.ql b/python/ql/test/library-tests/PointsTo/inheritance/Calls.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from Call c, FunctionObject f
 where f.getACall().getNode() = c
diff --git a/python/ql/test/library-tests/PointsTo/inheritance/Declares.ql b/python/ql/test/library-tests/PointsTo/inheritance/Declares.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, string name
 where class_declares_attribute(cls, name)
diff --git a/python/ql/test/library-tests/PointsTo/inheritance/MetaClass.ql b/python/ql/test/library-tests/PointsTo/inheritance/MetaClass.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, ClassObject meta
 where
diff --git a/python/ql/test/library-tests/PointsTo/inheritance/SuperTypes.ql b/python/ql/test/library-tests/PointsTo/inheritance/SuperTypes.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, ClassObject sup
 where
diff --git a/python/ql/test/library-tests/PointsTo/metaclass/Failed.ql b/python/ql/test/library-tests/PointsTo/metaclass/Failed.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, string reason
 where
diff --git a/python/ql/test/library-tests/PointsTo/metaclass/Style.ql b/python/ql/test/library-tests/PointsTo/metaclass/Style.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, string style
 where
diff --git a/python/ql/test/library-tests/PointsTo/metaclass/test.ql b/python/ql/test/library-tests/PointsTo/metaclass/test.ql
@@ -1,5 +1,5 @@
 import python
-private import semmle.python.objects.ObjectInternal
+private import LegacyPointsTo
 
 /** An unknown type. Not usually visible. */
 class UnknownType extends UnknownClassInternal {
diff --git a/python/ql/test/library-tests/PointsTo/new/Call.ql b/python/ql/test/library-tests/PointsTo/new/Call.ql
@@ -1,5 +1,6 @@
 import python
 import Util
+private import LegacyPointsTo
 
 from ControlFlowNode call, FunctionObject func
 where call = func.getACall()
diff --git a/python/ql/test/library-tests/PointsTo/new/ClassMethod.ql b/python/ql/test/library-tests/PointsTo/new/ClassMethod.ql
@@ -1,5 +1,6 @@
 import python
 import Util
+private import LegacyPointsTo
 
 from ClassMethodObject cm, CallNode call
 where call = cm.getACall()
diff --git a/python/ql/test/library-tests/PointsTo/new/NameSpace.ql b/python/ql/test/library-tests/PointsTo/new/NameSpace.ql
@@ -1,5 +1,6 @@
 import python
 import Util
+private import LegacyPointsTo
 
 from Scope s, string name, Object val
 where
diff --git a/python/ql/test/library-tests/PointsTo/new/PointsToMissing.ql b/python/ql/test/library-tests/PointsTo/new/PointsToMissing.ql
@@ -1,6 +1,6 @@
 import python
 import Util
-import semmle.python.pointsto.PointsTo
+private import LegacyPointsTo
 
 /* This test should return _no_ results. */
 predicate relevant_node(ControlFlowNode n) {
diff --git a/python/ql/test/library-tests/PointsTo/new/PointsToUnknown.ql b/python/ql/test/library-tests/PointsTo/new/PointsToUnknown.ql
@@ -1,6 +1,6 @@
 import python
 import Util
-import semmle.python.pointsto.PointsTo
+private import LegacyPointsTo
 
 from ControlFlowNode f, ControlFlowNode x
 where PointsTo::pointsTo(f, _, ObjectInternal::unknown(), x)
diff --git a/python/ql/test/library-tests/PointsTo/new/PointsToWithContext.ql b/python/ql/test/library-tests/PointsTo/new/PointsToWithContext.ql
@@ -1,7 +1,6 @@
 import python
 import Util
-import semmle.python.pointsto.PointsTo
-import semmle.python.pointsto.PointsToContext
+private import LegacyPointsTo
 
 from ControlFlowNode f, Object o, ClassObject c, ControlFlowNode x, PointsToContext ctx
 where PointsTo::points_to(f, ctx, o, c, x)
diff --git a/python/ql/test/library-tests/PointsTo/new/PointsToWithType.ql b/python/ql/test/library-tests/PointsTo/new/PointsToWithType.ql
@@ -1,6 +1,6 @@
 import python
 import Util
-import semmle.python.pointsto.PointsTo
+private import LegacyPointsTo
 
 from ControlFlowNode f, Object o, ClassObject c, ControlFlowNode x
 where PointsTo::points_to(f, _, o, c, x)
diff --git a/python/ql/test/library-tests/PointsTo/new/Reachable.ql b/python/ql/test/library-tests/PointsTo/new/Reachable.ql
@@ -1,5 +1,5 @@
 import python
-private import semmle.python.pointsto.PointsTo
+private import LegacyPointsTo
 import Util
 
 from ControlFlowNode f, Context ctx
diff --git a/python/ql/test/library-tests/PointsTo/new/SSA.ql b/python/ql/test/library-tests/PointsTo/new/SSA.ql
@@ -1,6 +1,5 @@
 import python
-private import semmle.python.pointsto.PointsTo
-private import semmle.python.pointsto.PointsToContext
+private import LegacyPointsTo
 import Util
 
 predicate ssa_variable_points_to(
diff --git a/python/ql/test/library-tests/PointsTo/new/SourceEdgeDefinitions.ql b/python/ql/test/library-tests/PointsTo/new/SourceEdgeDefinitions.ql
@@ -1,5 +1,4 @@
 import python
-import semmle.python.pointsto.PointsTo
 import Util
 
 from SsaSourceVariable var, ControlFlowNode use, BasicBlock pred
diff --git a/python/ql/test/library-tests/PointsTo/new/SourceNodeDefinitions.ql b/python/ql/test/library-tests/PointsTo/new/SourceNodeDefinitions.ql
@@ -1,5 +1,4 @@
 import python
-import semmle.python.pointsto.PointsTo
 import Util
 
 from SsaSourceVariable var, ControlFlowNode defn, string kind
diff --git a/python/ql/test/library-tests/PointsTo/new/SsaAttr.ql b/python/ql/test/library-tests/PointsTo/new/SsaAttr.ql
@@ -1,6 +1,5 @@
 import python
-private import semmle.python.pointsto.PointsTo
-private import semmle.python.objects.ObjectInternal
+private import LegacyPointsTo
 import Util
 
 from EssaVariable var, string name, ObjectInternal o, Context ctx
diff --git a/python/ql/test/library-tests/PointsTo/new/SsaUses.ql b/python/ql/test/library-tests/PointsTo/new/SsaUses.ql
@@ -1,5 +1,4 @@
 import python
-import semmle.python.pointsto.PointsTo
 import Util
 
 from EssaVariable var, ControlFlowNode use
diff --git a/python/ql/test/library-tests/PointsTo/new/TestEvaluate.ql b/python/ql/test/library-tests/PointsTo/new/TestEvaluate.ql
@@ -1,6 +1,5 @@
 import python
-import semmle.python.pointsto.PointsTo
-import semmle.python.pointsto.PointsToContext
+private import LegacyPointsTo
 import Util
 
 from
diff --git a/python/ql/test/library-tests/PointsTo/new/Util.qll b/python/ql/test/library-tests/PointsTo/new/Util.qll
@@ -1,5 +1,5 @@
 import python
-import semmle.python.objects.ObjectInternal
+private import LegacyPointsTo
 
 bindingset[which]
 string locate(Location l, string which) {
diff --git a/python/ql/test/library-tests/PointsTo/new/VarUses.ql b/python/ql/test/library-tests/PointsTo/new/VarUses.ql
@@ -1,5 +1,5 @@
 import python
-import semmle.python.pointsto.PointsTo
+private import LegacyPointsTo
 import Util
 
 from SsaSourceVariable var, ControlFlowNode use
diff --git a/python/ql/test/library-tests/PointsTo/regressions/missing/metaclass/getACall.ql b/python/ql/test/library-tests/PointsTo/regressions/missing/metaclass/getACall.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from PythonFunctionValue func
 select func, func.getACall()
diff --git a/python/ql/test/library-tests/PointsTo/regressions/wrong/module-imports/conflict-stdlib/LocalModuleWithRef.ql b/python/ql/test/library-tests/PointsTo/regressions/wrong/module-imports/conflict-stdlib/LocalModuleWithRef.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ModuleValue mv, ControlFlowNode ref, string local_external
 where
diff --git a/python/ql/test/library-tests/PointsTo/regressions/wrong/module-imports/conflict-stdlib/ModuleWithLocalRef.ql b/python/ql/test/library-tests/PointsTo/regressions/wrong/module-imports/conflict-stdlib/ModuleWithLocalRef.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ModuleValue mv, ControlFlowNode ref, string in_stdlib, string local_external, string is_missing
 where
diff --git a/python/ql/test/library-tests/PointsTo/returns/Test.ql b/python/ql/test/library-tests/PointsTo/returns/Test.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from PyFunctionObject f
 select f.toString(), f.getAnInferredReturnType().toString()
diff --git a/python/ql/test/library-tests/PointsTo/subclass/Checks.ql b/python/ql/test/library-tests/PointsTo/subclass/Checks.ql
@@ -1,5 +1,5 @@
 import python
-import semmle.python.pointsto.PointsTo
+private import LegacyPointsTo
 
 from Value sup, Value cls
 where Expressions::requireSubClass(cls, sup)
diff --git a/python/ql/test/library-tests/attributes/SelfAttribute.ql b/python/ql/test/library-tests/attributes/SelfAttribute.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from SelfAttributeRead sa, int line, string g, string l
 where
diff --git a/python/ql/test/library-tests/classes/abstract/Abstract.ql b/python/ql/test/library-tests/classes/abstract/Abstract.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, string abstract
 where
diff --git a/python/ql/test/library-tests/classes/attr/class_attr.ql b/python/ql/test/library-tests/classes/attr/class_attr.ql
@@ -5,6 +5,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, int line, string name, Object obj
 where
diff --git a/python/ql/test/library-tests/classes/attr/class_defined_attr.ql b/python/ql/test/library-tests/classes/attr/class_defined_attr.ql
@@ -5,6 +5,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, int line, string name, Object obj
 where
diff --git a/python/ql/test/library-tests/classes/attr/class_defines_attr.ql b/python/ql/test/library-tests/classes/attr/class_defines_attr.ql
@@ -5,6 +5,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, int line, string name
 where
diff --git a/python/ql/test/library-tests/classes/attr/class_has_attr.ql b/python/ql/test/library-tests/classes/attr/class_has_attr.ql
@@ -5,6 +5,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, int line, string name
 where
diff --git a/python/ql/test/library-tests/classes/attr/hash.ql b/python/ql/test/library-tests/classes/attr/hash.ql
@@ -5,6 +5,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, int line, Object obj
 where
diff --git a/python/ql/test/library-tests/classes/mro/C3.ql b/python/ql/test/library-tests/classes/mro/C3.ql
@@ -1,5 +1,6 @@
 import python
 import semmle.python.pointsto.MRO
+private import LegacyPointsTo
 
 from ClassValue cls
 where not cls.isBuiltin()
diff --git a/python/ql/test/library-tests/dependencies/Dependencies.ql b/python/ql/test/library-tests/dependencies/Dependencies.ql
@@ -1,5 +1,6 @@
 import python
 import semmle.python.dependencies.Dependencies
+private import LegacyPointsTo
 
 from DependencyKind dk, AstNode src, Object target
 where dk.isADependency(src, target)
diff --git a/python/ql/test/library-tests/descriptors/Descriptors.ql b/python/ql/test/library-tests/descriptors/Descriptors.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, string kind
 where
diff --git a/python/ql/test/library-tests/descriptors/Methods.ql b/python/ql/test/library-tests/descriptors/Methods.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 int lineof(Object o) { result = o.getOrigin().getLocation().getStartLine() }
 
diff --git a/python/ql/test/library-tests/descriptors/Properties.ql b/python/ql/test/library-tests/descriptors/Properties.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from PropertyValue p, string method_name, FunctionValue method
 where
diff --git a/python/ql/test/library-tests/exceptions/Handles.ql b/python/ql/test/library-tests/exceptions/Handles.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ExceptFlowNode ex, Value val
 where ex.handledException(val, _, _)
diff --git a/python/ql/test/library-tests/exceptions/Legal.ql b/python/ql/test/library-tests/exceptions/Legal.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, string legal
 where
diff --git a/python/ql/test/library-tests/modules/duplicate_name/Modules.ql b/python/ql/test/library-tests/modules/duplicate_name/Modules.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from string name, int mcnt
 where mcnt = strictcount(Module m | m.getName() = name) and mcnt > 1
diff --git a/python/ql/test/library-tests/objects/Name.ql b/python/ql/test/library-tests/objects/Name.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from Object o, string name
 where
diff --git a/python/ql/test/library-tests/overrides/FunctionOverrides.ql b/python/ql/test/library-tests/overrides/FunctionOverrides.ql
diff --git a/python/ql/test/library-tests/state_tracking/Test.ql b/python/ql/test/library-tests/state_tracking/Test.ql
diff --git a/python/ql/test/library-tests/taint/config/TaintLib.qll b/python/ql/test/library-tests/taint/config/TaintLib.qll
diff --git a/python/ql/test/library-tests/taint/config/TaintedArgument.ql b/python/ql/test/library-tests/taint/config/TaintedArgument.ql
diff --git a/python/ql/test/library-tests/taint/general/ModuleAttribute.ql b/python/ql/test/library-tests/taint/general/ModuleAttribute.ql
diff --git a/python/ql/test/library-tests/taint/general/TaintLib.qll b/python/ql/test/library-tests/taint/general/TaintLib.qll
diff --git a/python/ql/test/library-tests/types/attributes/Test.ql b/python/ql/test/library-tests/types/attributes/Test.ql
diff --git a/python/ql/test/library-tests/types/classattr/ClassAttribute.ql b/python/ql/test/library-tests/types/classattr/ClassAttribute.ql
diff --git a/python/ql/test/library-tests/types/classattr/ClassMember.ql b/python/ql/test/library-tests/types/classattr/ClassMember.ql
diff --git a/python/ql/test/library-tests/types/classattr/SpecialAttribute.ql b/python/ql/test/library-tests/types/classattr/SpecialAttribute.ql
diff --git a/python/ql/test/library-tests/types/classes/FailedInference.ql b/python/ql/test/library-tests/types/classes/FailedInference.ql
diff --git a/python/ql/test/library-tests/types/classes/duplicate_base.ql b/python/ql/test/library-tests/types/classes/duplicate_base.ql
diff --git a/python/ql/test/library-tests/types/exceptions/ExitRaises.ql b/python/ql/test/library-tests/types/exceptions/ExitRaises.ql
diff --git a/python/ql/test/library-tests/types/exceptions/Handles.ql b/python/ql/test/library-tests/types/exceptions/Handles.ql
diff --git a/python/ql/test/library-tests/types/exceptions/Impossible.ql b/python/ql/test/library-tests/types/exceptions/Impossible.ql
diff --git a/python/ql/test/library-tests/types/exceptions/LineRaises.ql b/python/ql/test/library-tests/types/exceptions/LineRaises.ql
diff --git a/python/ql/test/library-tests/types/exceptions/Raises.ql b/python/ql/test/library-tests/types/exceptions/Raises.ql
diff --git a/python/ql/test/library-tests/types/exceptions/Reraises.ql b/python/ql/test/library-tests/types/exceptions/Reraises.ql
diff --git a/python/ql/test/library-tests/types/exceptions/Viable.ql b/python/ql/test/library-tests/types/exceptions/Viable.ql
diff --git a/python/ql/test/library-tests/types/properties/Deleters.ql b/python/ql/test/library-tests/types/properties/Deleters.ql
diff --git a/python/ql/test/library-tests/types/properties/Getters.ql b/python/ql/test/library-tests/types/properties/Getters.ql
diff --git a/python/ql/test/library-tests/types/properties/PythonProperties.ql b/python/ql/test/library-tests/types/properties/PythonProperties.ql
diff --git a/python/ql/test/library-tests/types/properties/Setters.ql b/python/ql/test/library-tests/types/properties/Setters.ql

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import python`
	`2`	`+private import LegacyPointsTo`
`2`	`3`
`3`	`4`	`from ClassValue cls, string description`
`4`	`5`	`where`