Python: Hide points-to imports in python.qll

python/ql/lib/LegacyPointsTo.qll

@@ -20,8 +20,21 @@
  */
 
 private import python
-private import semmle.python.pointsto.PointsTo
-private import semmle.python.objects.Modules
+import semmle.python.pointsto.Base
+import semmle.python.pointsto.Context
+import semmle.python.pointsto.PointsTo
+import semmle.python.pointsto.PointsToContext
+import semmle.python.objects.ObjectAPI
+import semmle.python.objects.ObjectInternal
+import semmle.python.types.Object
+import semmle.python.types.ClassObject
+import semmle.python.types.FunctionObject
+import semmle.python.types.ModuleObject
+import semmle.python.types.Exceptions
+import semmle.python.types.Properties
+import semmle.python.types.ImportTime
+import semmle.python.types.Descriptors
+import semmle.python.SelfAttribute
 
 /**
  * An extension of `ControlFlowNode` that provides points-to predicates.

python/ql/lib/analysis/DefinitionTracking.qll

@@ -4,7 +4,6 @@
 
 import python
 private import LegacyPointsTo
-import semmle.python.pointsto.PointsTo
 import IDEContextual
 
 private newtype TDefinition =

python/ql/lib/python.qll

@@ -19,22 +19,22 @@ import semmle.python.Constants
 import semmle.python.Scope
 import semmle.python.Comment
 import semmle.python.GuardedControlFlow
-import semmle.python.types.ImportTime
-import semmle.python.types.Object
-import semmle.python.types.ClassObject
-import semmle.python.types.FunctionObject
-import semmle.python.types.ModuleObject
-import semmle.python.types.Version
-import semmle.python.types.Descriptors
+private import semmle.python.types.ImportTime
+private import semmle.python.types.Object
+private import semmle.python.types.ClassObject
+private import semmle.python.types.FunctionObject
+private import semmle.python.types.ModuleObject
+private import semmle.python.types.Version
+private import semmle.python.types.Descriptors
 import semmle.python.SSA
-import semmle.python.SelfAttribute
-import semmle.python.types.Properties
+private import semmle.python.SelfAttribute
+private import semmle.python.types.Properties
 import semmle.python.xml.XML
 import semmle.python.essa.Essa
-import semmle.python.pointsto.Base
-import semmle.python.pointsto.Context
-import semmle.python.pointsto.CallGraph
-import semmle.python.objects.ObjectAPI
+private import semmle.python.pointsto.Base
+private import semmle.python.pointsto.Context
+private import semmle.python.pointsto.CallGraph
+private import semmle.python.objects.ObjectAPI
 import semmle.python.Unit
 import site
 private import semmle.python.Overlay

python/ql/lib/semmle/python/Flow.qll

@@ -1,6 +1,7 @@
 import python
 private import semmle.python.internal.CachedStages
 private import codeql.controlflow.BasicBlock as BB
+private import LegacyPointsTo
 
 /*
  * Note about matching parent and child nodes and CFG splitting:

python/ql/lib/semmle/python/SSA.qll

@@ -1,6 +1,7 @@
 /** SSA library */
 
 import python
+private import LegacyPointsTo
 
 /**
  * A single static assignment variable.

python/ql/lib/semmle/python/SelfAttribute.qll

@@ -5,6 +5,7 @@
 
 import python
 private import semmle.python.pointsto.Filters
+private import LegacyPointsTo
 
 /**
  * An attribute access where the left hand side of the attribute expression

python/ql/lib/semmle/python/dataflow/new/internal/ImportResolution.qll

@@ -9,6 +9,7 @@ private import semmle.python.dataflow.new.DataFlow
 private import semmle.python.dataflow.new.internal.ImportStar
 private import semmle.python.dataflow.new.TypeTracking
 private import semmle.python.dataflow.new.internal.DataFlowPrivate
+private import semmle.python.essa.SsaDefinitions
 
 /**
  * Python modules and the way imports are resolved are... complicated. Here's a crash course in how

python/ql/lib/semmle/python/dataflow/old/Configuration.qll

@@ -1,6 +1,6 @@
 import python
 import semmle.python.dataflow.TaintTracking
-private import semmle.python.objects.ObjectInternal
+private import LegacyPointsTo
 private import semmle.python.dataflow.Implementation
 
 module TaintTracking {

python/ql/lib/semmle/python/dataflow/old/Files.qll

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 import semmle.python.dataflow.TaintTracking
 
 class OpenFile extends TaintKind {

python/ql/lib/semmle/python/dataflow/old/Implementation.qll

@@ -1,7 +1,6 @@
 import python
 private import LegacyPointsTo
 import semmle.python.dataflow.TaintTracking
-private import semmle.python.objects.ObjectInternal
 private import semmle.python.pointsto.Filters as Filters
 import semmle.python.dataflow.Legacy
 

python/ql/lib/semmle/python/dataflow/old/StateTracking.qll

@@ -9,9 +9,7 @@
  */
 
 import python
-private import semmle.python.pointsto.PointsTo
-private import semmle.python.pointsto.PointsToContext
-private import semmle.python.objects.ObjectInternal
+private import LegacyPointsTo
 
 /** A state that should be tracked. */
 abstract class TrackableState extends string {

python/ql/lib/semmle/python/dataflow/old/TaintTracking.qll

@@ -89,7 +89,6 @@
 import python
 private import LegacyPointsTo
 private import semmle.python.pointsto.Filters as Filters
-private import semmle.python.objects.ObjectInternal
 private import semmle.python.dataflow.Implementation
 import semmle.python.dataflow.Configuration
 

python/ql/lib/semmle/python/dependencies/DependencyKind.qll

@@ -1,4 +1,5 @@
 import semmle.python.dependencies.Dependencies
+private import LegacyPointsTo
 
 /**
  * A library describing an abstract mechanism for representing dependency categories.

python/ql/lib/semmle/python/dependencies/TechInventory.qll

@@ -1,6 +1,7 @@
 import python
 import semmle.python.dependencies.Dependencies
 import semmle.python.dependencies.DependencyKind
+private import LegacyPointsTo
 
 /**
  * Combine the source-file and package into a single string:

python/ql/lib/semmle/python/essa/Definitions.qll

@@ -1,5 +1,4 @@
 import python
-
 /*
  * Classification of variables. These should be non-overlapping and complete.
  *
@@ -12,6 +11,9 @@ import python
  * Escaping globals -- Global variables that have definitions and at least one of those definitions is in another scope.
  */
 
+private import LegacyPointsTo
+private import semmle.python.essa.SsaDefinitions
+
 /** A source language variable, to be converted into a set of SSA variables. */
 abstract class SsaSourceVariable extends @py_variable {
   SsaSourceVariable() {

python/ql/lib/semmle/python/essa/Essa.qll

@@ -6,6 +6,8 @@ import python
 private import SsaCompute
 import semmle.python.essa.Definitions
 private import semmle.python.internal.CachedStages
+private import LegacyPointsTo
+private import semmle.python.essa.SsaDefinitions
 
 /** An (enhanced) SSA variable derived from `SsaSourceVariable`. */
 class EssaVariable extends TEssaDefinition {

python/ql/lib/semmle/python/essa/SsaDefinitions.qll

@@ -5,6 +5,7 @@
 
 import python
 private import semmle.python.internal.CachedStages
+private import LegacyPointsTo
 
 cached
 module SsaSource {

python/ql/lib/semmle/python/libraries/Zope.qll

@@ -1,7 +1,7 @@
 /** Utilities for handling the zope libraries */
 
 import python
-private import semmle.python.pointsto.PointsTo
+private import LegacyPointsTo
 
 /** A method that belongs to a sub-class of `zope.interface.Interface` */
 class ZopeInterfaceMethodValue extends PythonFunctionValue {

python/ql/lib/semmle/python/objects/Constants.qll

@@ -5,6 +5,7 @@ private import semmle.python.pointsto.PointsTo
 private import semmle.python.pointsto.MRO
 private import semmle.python.pointsto.PointsToContext
 private import semmle.python.types.Builtins
+private import semmle.python.objects.ObjectAPI
 
 /**
  * A constant.

python/ql/lib/semmle/python/objects/Descriptors.qll

@@ -5,6 +5,7 @@ private import semmle.python.pointsto.PointsTo
 private import semmle.python.pointsto.PointsToContext
 private import semmle.python.pointsto.MRO
 private import semmle.python.types.Builtins
+private import semmle.python.pointsto.Context
 
 /** A property object. */
 class PropertyInternal extends ObjectInternal, TProperty {

python/ql/lib/semmle/python/objects/Instances.qll

@@ -5,6 +5,8 @@ private import semmle.python.pointsto.PointsTo
 private import semmle.python.pointsto.MRO
 private import semmle.python.pointsto.PointsToContext
 private import semmle.python.types.Builtins
+private import semmle.python.pointsto.Context
+private import semmle.python.pointsto.Base
 
 /** A class representing instances */
 abstract class InstanceObject extends ObjectInternal {

python/ql/lib/semmle/python/objects/Modules.qll

@@ -5,6 +5,7 @@ private import semmle.python.pointsto.PointsTo
 private import semmle.python.pointsto.MRO
 private import semmle.python.pointsto.PointsToContext
 private import semmle.python.types.Builtins
+private import semmle.python.types.ImportTime
 
 /** A class representing modules */
 abstract class ModuleObjectInternal extends ObjectInternal {

python/ql/lib/semmle/python/objects/ObjectAPI.qll

@@ -6,9 +6,6 @@
 import python
 private import LegacyPointsTo
 private import TObject
-private import semmle.python.objects.ObjectInternal
-private import semmle.python.pointsto.PointsTo
-private import semmle.python.pointsto.PointsToContext
 private import semmle.python.pointsto.MRO
 private import semmle.python.types.Builtins
 

python/ql/lib/semmle/python/objects/TObject.qll

@@ -6,6 +6,7 @@ private import semmle.python.objects.ObjectInternal
 private import semmle.python.pointsto.PointsTo
 private import semmle.python.pointsto.PointsToContext
 private import semmle.python.internal.CachedStages
+private import semmle.python.pointsto.Context
 
 /**
  * Internal type backing `ObjectInternal` and `Value`

python/ql/lib/semmle/python/pointsto/Base.qll

@@ -12,6 +12,8 @@ import python
 import semmle.python.essa.SsaDefinitions
 private import semmle.python.types.Builtins
 private import semmle.python.internal.CachedStages
+private import semmle.python.types.Object
+private import semmle.python.types.ClassObject
 
 /*
  * The following predicates exist in order to provide

python/ql/lib/semmle/python/pointsto/CallGraph.qll

@@ -11,6 +11,8 @@
 
 import python
 private import semmle.python.pointsto.PointsToContext
+private import semmle.python.types.FunctionObject
+private import semmle.python.pointsto.Context
 
 private newtype TTInvocation =
   TInvocation(FunctionObject f, Context c) {

python/ql/lib/semmle/python/pointsto/PointsTo.qll

@@ -7,6 +7,11 @@ private import semmle.python.pointsto.MRO
 private import semmle.python.types.Builtins
 private import semmle.python.types.Extensions
 private import semmle.python.internal.CachedStages
+private import semmle.python.types.Object
+private import semmle.python.types.FunctionObject
+private import semmle.python.types.ClassObject
+private import semmle.python.pointsto.Base
+private import semmle.python.types.ImportTime
 
 /* Use this version for speed */
 class CfgOrigin extends @py_object {

python/ql/lib/semmle/python/pointsto/PointsToContext.qll

@@ -1,6 +1,8 @@
 import python
 private import semmle.python.pointsto.PointsTo
 private import semmle.python.objects.ObjectInternal
+private import semmle.python.types.ImportTime
+private import semmle.python.types.Version
 
 /*
  * A note on 'cost'. Cost doesn't represent the cost to compute,

python/ql/lib/semmle/python/types/Builtins.qll

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 class Builtin extends @py_cobject {
   Builtin() {

python/ql/lib/semmle/python/types/ClassObject.qll

@@ -6,6 +6,7 @@ private import semmle.python.pointsto.PointsTo
 private import semmle.python.pointsto.MRO
 private import semmle.python.types.Builtins
 private import semmle.python.objects.ObjectInternal
+private import semmle.python.types.ImportTime
 
 /**
  * A class whose instances represents Python classes.

python/ql/lib/semmle/python/types/Descriptors.qll

@@ -1,5 +1,8 @@
 import python
 private import semmle.python.objects.ObjectInternal
+private import semmle.python.types.Object
+private import semmle.python.types.FunctionObject
+private import semmle.python.pointsto.Context
 
 /** A class method object. Either a decorated function or an explicit call to classmethod(f) */
 class ClassMethodObject extends Object {

python/ql/lib/semmle/python/types/Extensions.qll

@@ -16,6 +16,7 @@ private import semmle.python.pointsto.PointsToContext
 private import semmle.python.objects.TObject
 /* Make ObjectInternal visible to save extra imports in user code */
 import semmle.python.objects.ObjectInternal
+import semmle.python.pointsto.Context
 
 abstract class PointsToExtension extends @py_flow_node {
   string toString() { result = "PointsToExtension with missing toString" }

python/ql/lib/semmle/python/types/FunctionObject.qll

@@ -1,10 +1,7 @@
 import python
 private import LegacyPointsTo
-import semmle.python.types.Exceptions
-private import semmle.python.pointsto.PointsTo
 private import semmle.python.objects.Callables
 private import semmle.python.libraries.Zope
-private import semmle.python.objects.ObjectInternal
 private import semmle.python.types.Builtins
 
 /** A function object, whether written in Python or builtin */

python/ql/lib/semmle/python/types/ModuleKind.qll

@@ -1,4 +1,5 @@
 import python
+private import semmle.python.types.ModuleObject
 
 private predicate is_normal_module(ModuleObject m) {
   m instanceof BuiltinModuleObject

python/ql/lib/semmle/python/types/ModuleObject.qll

@@ -2,6 +2,9 @@ import python
 private import semmle.python.pointsto.PointsTo
 private import semmle.python.objects.ObjectInternal
 private import semmle.python.types.ModuleKind
+private import semmle.python.types.Object
+private import semmle.python.types.ClassObject
+private import semmle.python.objects.ObjectAPI
 
 abstract class ModuleObject extends Object {
   ModuleValue theModule() {

python/ql/lib/semmle/python/types/Object.qll

@@ -1,6 +1,5 @@
 import python
 private import LegacyPointsTo
-private import semmle.python.objects.ObjectInternal
 private import semmle.python.types.Builtins
 private import semmle.python.internal.CachedStages
 

python/ql/lib/semmle/python/values/StringAttributes.qll

@@ -1,8 +1,5 @@
 import python
 private import LegacyPointsTo
-private import semmle.python.types.Object
-private import semmle.python.types.ClassObject
-private import semmle.python.types.FunctionObject
 
 predicate string_attribute_all(ControlFlowNodeWithPointsTo n, string attr) {
   (n.getNode() instanceof Unicode or n.getNode() instanceof Bytes) and

python/ql/src/Expressions/ContainsNonContainer.ql

@@ -13,7 +13,6 @@
 
 import python
 private import LegacyPointsTo
-import semmle.python.pointsto.PointsTo
 
 predicate rhs_in_expr(ControlFlowNode rhs, Compare cmp) {
   exists(Cmpop op, int i | cmp.getOp(i) = op and cmp.getComparator(i) = rhs.getNode() |

python/ql/src/Expressions/IsComparisons.qll

@@ -3,6 +3,7 @@
 import python
 private import LegacyPointsTo
 private import semmle.python.objects.ObjectInternal
+private import semmle.python.objects.ObjectAPI
 
 /** Holds if the comparison `comp` uses `is` or `is not` (represented as `op`) to compare its `left` and `right` arguments. */
 predicate comparison_using_is(Compare comp, ControlFlowNode left, Cmpop op, ControlFlowNode right) {

python/ql/src/Statements/RedundantAssignment.ql

@@ -14,6 +14,7 @@
 
 import python
 private import LegacyPointsTo
+private import semmle.python.objects.ObjectAPI
 
 predicate assignment(AssignStmt a, Expr left, Expr right) {
   a.getATarget() = left and a.getValue() = right

python/ql/src/Variables/UndefinedGlobal.ql

@@ -14,7 +14,6 @@ import python
 private import LegacyPointsTo
 import Variables.MonkeyPatched
 import Loop
-import semmle.python.pointsto.PointsTo
 
 predicate guarded_against_name_error(Name u) {
   exists(Try t | t.getBody().getAnItem().contains(u) |