Python: Fix library tests

python/ql/test/library-tests/PointsTo/api/ClassValue.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassValue cls, string description
 where

python/ql/test/library-tests/PointsTo/api/Constants.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from string txt, Value val
 where

python/ql/test/library-tests/PointsTo/api/QualifedNames.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from FunctionValue v, string name
 where

python/ql/test/library-tests/PointsTo/api/Value.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from Value val, string name
 where

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()

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,

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,

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()

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()

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

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

python/ql/test/library-tests/PointsTo/functions/NeverReturns.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from FunctionObject f
 where f.neverReturns()

python/ql/test/library-tests/PointsTo/functions/test.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from Call c, FunctionObject f
 where

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()

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

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

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

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)

python/ql/test/library-tests/PointsTo/inheritance/MetaClass.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, ClassObject meta
 where

python/ql/test/library-tests/PointsTo/inheritance/SuperTypes.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, ClassObject sup
 where

python/ql/test/library-tests/PointsTo/metaclass/Failed.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, string reason
 where

python/ql/test/library-tests/PointsTo/metaclass/Style.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, string style
 where

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 {

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()

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()

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

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) {

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)

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)

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)

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

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(

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

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

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

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

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

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) {

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

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()

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

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

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()

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)