Merge pull request #20739 from github/tausbn/python-remove-top-level-points-to-imports

Python: Hide points-to imports in `python.qll`

python/ql/test/library-tests/ControlFlow/general/Comments.ql

@@ -1,5 +1,6 @@
 import python
+private import LegacyPointsTo
 
-from Module m, int n
-where n = m.getMetrics().getNumberOfLinesOfComments()
+from ModuleMetrics m, int n
+where n = m.getNumberOfLinesOfComments()
 select m.toString(), n

python/ql/test/library-tests/ControlFlow/general/Cyclo.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
-from Function func
-select func.toString(), func.getMetrics().getCyclomaticComplexity()
+from FunctionMetrics func
+select func.toString(), func.getCyclomaticComplexity()

python/ql/test/library-tests/ControlFlow/general/Lines.ql

@@ -1,8 +1,9 @@
 import python
+private import LegacyPointsTo
 
 from Scope s, int n
 where
-  exists(Function f | f = s | n = f.getMetrics().getNumberOfLines())
+  exists(FunctionMetrics f | f = s | n = f.getNumberOfLines())
   or
-  exists(Module m | m = s | n = m.getMetrics().getNumberOfLines())
+  exists(ModuleMetrics m | m = s | n = m.getNumberOfLines())
 select s.toString(), n

python/ql/test/library-tests/ControlFlow/ssa/undefined/test.ql

@@ -1,5 +1,6 @@
 import python
+private import LegacyPointsTo
 
-from SsaVariable var
+from SsaVariableWithPointsTo var
 where var.maybeUndefined()
 select var.getDefinition().getLocation().getStartLine(), var.toString()

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/GlobalPointsTo.ql

@@ -1,5 +1,6 @@
 import python
 private import LegacyPointsTo
+private import semmle.python.types.ImportTime
 import interesting
 
 from int line, ControlFlowNodeWithPointsTo f, Object o, ImportTimeScope n

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)

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

python/ql/test/library-tests/classes/abstract/Abstract.ql

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

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

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

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

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

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

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

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)

python/ql/test/library-tests/descriptors/Descriptors.ql

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

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

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

python/ql/test/library-tests/exceptions/Handles.ql

@@ -1,5 +1,6 @@
 import python
+private import LegacyPointsTo
 
-from ExceptFlowNode ex, Value val
+from ExceptFlowNodeWithPointsTo ex, Value val
 where ex.handledException(val, _, _)
 select ex.getLocation().getStartLine(), ex.toString(), val.toString()

python/ql/test/library-tests/exceptions/Legal.ql

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

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

python/ql/test/library-tests/objects/Literals.ql

@@ -1,5 +1,6 @@
 /* Test that there are no literals that do not have a corresponding object. */
 import python
+private import LegacyPointsTo
 
 string repr(Expr e) {
   result = e.(Num).getN() or
@@ -8,5 +9,5 @@ string repr(Expr e) {
 }
 
 from ImmutableLiteral l
-where not exists(l.getLiteralObject())
+where not exists(getLiteralObject(l))
 select l.getLocation().getStartLine(), repr(l)

python/ql/test/library-tests/objects/Name.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from Object o, string name
 where

python/ql/test/library-tests/overrides/FunctionOverrides.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from PythonFunctionValue f, string overriding, string overridden
 where

python/ql/test/library-tests/state_tracking/Test.ql

@@ -1,5 +1,6 @@
 import python
 import Lib
+private import LegacyPointsTo
 
 from ControlFlowNode f, TrackableState state, Context ctx, boolean sense
 where

python/ql/test/library-tests/taint/config/TaintLib.qll

@@ -1,5 +1,6 @@
 import python
 import semmle.python.dataflow.TaintTracking
+private import LegacyPointsTo
 
 class SimpleTest extends TaintKind {
   SimpleTest() { this = "simple.test" }

python/ql/test/library-tests/taint/config/TaintedArgument.ql

@@ -2,6 +2,7 @@ import python
 import semmle.python.dataflow.TaintTracking
 import TaintLib
 import semmle.python.dataflow.Implementation
+private import LegacyPointsTo
 
 from
   TaintTrackingImplementation config, TaintTrackingNode src, CallNode call,

python/ql/test/library-tests/taint/general/ModuleAttribute.ql

@@ -1,6 +1,7 @@
 import python
 import semmle.python.dataflow.Implementation
 import TaintLib
+private import LegacyPointsTo
 
 from ModuleValue m, string name, TaintedNode origin, TaintTrackingImplementation impl
 where impl.moduleAttributeTainted(m, name, origin)

python/ql/test/library-tests/taint/general/TaintLib.qll

@@ -1,5 +1,6 @@
 import python
 import semmle.python.dataflow.TaintTracking
+private import LegacyPointsTo
 
 class SimpleTest extends TaintKind {
   SimpleTest() { this = "simple.test" }

python/ql/test/library-tests/types/attributes/Test.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, ClassObject start, string name, Object val
 where not name.substring(0, 2) = "__" and val = cls.lookupMro(start, name)

python/ql/test/library-tests/types/classattr/ClassAttribute.ql

@@ -5,6 +5,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, string name, string kind
 where

python/ql/test/library-tests/types/classattr/ClassMember.ql

@@ -5,6 +5,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, string name, string kind, Object o
 where

python/ql/test/library-tests/types/classattr/SpecialAttribute.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, string name, string kind, Object o
 where

python/ql/test/library-tests/types/classes/FailedInference.ql

@@ -1,5 +1,5 @@
 import python
-import semmle.python.pointsto.PointsTo
+private import LegacyPointsTo
 
 from ClassValue cls, string reason
 where Types::failedInference(cls, reason)

python/ql/test/library-tests/types/classes/duplicate_base.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls
 where cls.hasDuplicateBases()

python/ql/test/library-tests/types/exceptions/ExitRaises.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from RaisingNode r, Scope s, ClassObject cls
 where r.viableExceptionalExit_objectapi(s, cls)

python/ql/test/library-tests/types/exceptions/Handles.ql

@@ -1,5 +1,6 @@
 import python
+private import LegacyPointsTo
 
-from ExceptFlowNode n, ClassObject cls
+from ExceptFlowNodeWithPointsTo n, ClassObject cls
 where n.handles_objectapi(cls)
 select n.getLocation().getStartLine(), cls.toString()

python/ql/test/library-tests/types/exceptions/Impossible.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from RaisingNode r, ControlFlowNode n, string kind
 where

python/ql/test/library-tests/types/exceptions/LineRaises.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from RaisingNode r, string type
 where

python/ql/test/library-tests/types/exceptions/Raises.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from PyFunctionObject f, string type
 where

python/ql/test/library-tests/types/exceptions/Reraises.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ReraisingNode r
 select r.getLocation().getStartLine(), r, r.getARaisedType().toString()

python/ql/test/library-tests/types/exceptions/Viable.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from RaisingNode r, ControlFlowNode n, ClassObject ex
 where r.viableExceptionEdge_objectapi(n, ex)

python/ql/test/library-tests/types/properties/Deleters.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from PythonPropertyObject p
 select p.toString(), p.getDeleter().toString()

python/ql/test/library-tests/types/properties/Getters.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from PythonPropertyObject p
 select p.toString(), p.getGetter().toString()

python/ql/test/library-tests/types/properties/PythonProperties.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from PythonPropertyObject p
 select p.toString()

python/ql/test/library-tests/types/properties/Setters.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from PythonPropertyObject p
 select p.toString(), p.getSetter().toString()