Python: Fix query tests

Mostly just adding `private import LegacyPointsTo`. Sometimes getting
rid of other imports that are superceded by that module.

python/ql/src/Classes/ClassAttributes.qll

@@ -1,5 +1,5 @@
 import python
-private import semmle.python.pointsto.PointsTo
+private import LegacyPointsTo
 
 /** A helper class for UndefinedClassAttribute.ql and MaybeUndefinedClassAttribute.ql */
 class CheckClass extends ClassObject {

python/ql/src/Classes/ConflictingAttributesInBaseClasses.ql

@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate does_nothing(PyFunctionObject f) {
   not exists(Stmt s | s.getScope() = f.getFunction() |

python/ql/src/Classes/DefineEqualsWhenAddingAttributes.ql

@@ -13,6 +13,7 @@
 
 import python
 import Equality
+private import LegacyPointsTo
 
 predicate class_stores_to_attribute(ClassValue cls, SelfAttributeStore store, string name) {
   exists(FunctionValue f |

python/ql/src/Classes/InconsistentMRO.ql

@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 ClassObject left_base(ClassObject type, ClassObject base) {
   exists(int i | i > 0 and type.getBaseType(i) = base and result = type.getBaseType(i - 1))

python/ql/src/Classes/MaybeUndefinedClassAttribute.ql

@@ -12,6 +12,7 @@
 
 import python
 import ClassAttributes
+private import LegacyPointsTo
 
 predicate guarded_by_other_attribute(SelfAttributeRead a, CheckClass c) {
   c.sometimesDefines(a.getName()) and

python/ql/src/Classes/MutatingDescriptor.ql

@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate mutates_descriptor(ClassObject cls, SelfAttributeStore s) {
   cls.isDescriptorType() and

python/ql/src/Classes/OverwritingAttributeInSuperClass.ql

@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 class InitCallStmt extends ExprStmt {
   InitCallStmt() {

python/ql/src/Classes/PropertyInOldStyleClass.ql

@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from PropertyObject prop, ClassObject cls
 where cls.declaredAttribute(_) = prop and not cls.failedInference() and not cls.isNewStyle()

python/ql/src/Classes/ShouldBeContextManager.ql

@@ -14,6 +14,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassValue c
 where not c.isBuiltin() and not c.isContextManager() and exists(c.declaredAttribute("__del__"))

python/ql/src/Classes/SlotsInOldStyleClass.ql

@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassObject c
 where not c.isNewStyle() and c.declaresAttribute("__slots__") and not c.failedInference()

python/ql/src/Classes/SuperInOldStyleClass.ql

@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate uses_of_super_in_old_style_class(Call s) {
   exists(Function f, ClassObject c |

python/ql/src/Classes/UndefinedClassAttribute.ql

@@ -12,6 +12,7 @@
 
 import python
 import ClassAttributes
+private import LegacyPointsTo
 
 predicate undefined_class_attribute(SelfAttributeRead a, CheckClass c, int line, string name) {
   name = a.getName() and

python/ql/src/Classes/UselessClass.ql

@@ -13,6 +13,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate fewer_than_two_public_methods(Class cls, int methods) {
   (methods = 0 or methods = 1) and

python/ql/src/Classes/WrongNameForArgumentInClassInstantiation.ql

@@ -16,6 +16,7 @@
 
 import python
 import Expressions.CallArgs
+private import LegacyPointsTo
 
 from Call call, ClassValue cls, string name, FunctionValue init
 where

python/ql/src/Classes/WrongNumberArgumentsInClassInstantiation.ql

@@ -15,6 +15,7 @@
 
 import python
 import Expressions.CallArgs
+private import LegacyPointsTo
 
 from Call call, ClassValue cls, string too, string should, int limit, FunctionValue init
 where

python/ql/src/Exceptions/IllegalExceptionHandlerType.ql

@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ExceptFlowNode ex, Value t, ClassValue c, ControlFlowNode origin, string what
 where

python/ql/src/Exceptions/IllegalRaise.ql

@@ -14,6 +14,7 @@
 import python
 import Raising
 import Exceptions.NotImplemented
+private import LegacyPointsTo
 
 from Raise r, ClassValue t
 where

python/ql/src/Expressions/IsComparisons.qll

@@ -2,8 +2,6 @@
 
 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/Expressions/NonPortableComparisonUsingIs.ql

@@ -13,6 +13,7 @@
 
 import python
 import IsComparisons
+private import LegacyPointsTo
 
 from Compare comp, Cmpop op, ClassValue c
 where

python/ql/src/Expressions/RedundantComparison.qll

@@ -1,6 +1,7 @@
 /** Helper functions for queries that test redundant comparisons. */
 
 import python
+private import LegacyPointsTo
 
 /** A comparison where the left and right hand sides appear to be identical. */
 class RedundantComparison extends Compare {

python/ql/src/Expressions/WrongNameForArgumentInCall.ql

@@ -16,6 +16,7 @@
 
 import python
 import Expressions.CallArgs
+private import LegacyPointsTo
 
 from Call call, FunctionObject func, string name
 where

python/ql/src/Expressions/WrongNumberArgumentsForFormat.ql

@@ -15,7 +15,6 @@
 
 import python
 import LegacyPointsTo
-import semmle.python.objects.ObjectInternal
 import semmle.python.strings
 
 predicate string_format(BinaryExpr operation, StringLiteral str, Value args, AstNode origin) {

python/ql/src/Expressions/WrongNumberArgumentsInCall.ql

@@ -13,6 +13,7 @@
  */
 
 import python
+private import LegacyPointsTo
 import CallArgs
 
 from Call call, FunctionValue func, string too, string should, int limit

python/ql/src/Functions/DeprecatedSliceMethod.ql

@@ -10,6 +10,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate slice_method_name(string name) {
   name = "__getslice__" or name = "__setslice__" or name = "__delslice__"

python/ql/src/Functions/IncorrectlyOverriddenMethod.ql

@@ -14,6 +14,7 @@
 
 import python
 import Expressions.CallArgs
+private import LegacyPointsTo
 
 from Call call, FunctionValue func, FunctionValue overridden, string problem
 where

python/ql/src/Functions/IncorrectlySpecifiedOverriddenMethod.ql

@@ -14,6 +14,7 @@
 
 import python
 import Expressions.CallArgs
+private import LegacyPointsTo
 
 from Call call, FunctionValue func, FunctionValue overriding, string problem
 where

python/ql/src/Functions/IterReturnsNonIterator.ql

@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassValue iterable, FunctionValue iter, ClassValue iterator
 where

python/ql/src/Functions/OverlyComplexDelMethod.ql

@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from FunctionValue method
 where

python/ql/src/Functions/ReturnValueIgnored.ql

@@ -14,7 +14,7 @@
  */
 
 import python
-import semmle.python.objects.Callables
+private import LegacyPointsTo
 
 predicate meaningful_return_value(Expr val) {
   val instanceof Name

python/ql/src/Imports/CyclicImport.ql

@@ -13,6 +13,7 @@
 
 import python
 import Cyclic
+private import LegacyPointsTo
 
 from ModuleValue m1, ModuleValue m2, Stmt imp
 where

python/ql/src/Imports/ModuleImportsItself.ql

@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate modules_imports_itself(ImportingStmt i, ModuleValue m) {
   i.getEnclosingModule() = m.getScope() and

python/ql/src/Imports/ModuleLevelCyclicImport.ql

@@ -14,6 +14,7 @@
 
 import python
 import Cyclic
+private import LegacyPointsTo
 
 // This is a potentially crashing bug if
 // 1. the imports in the whole cycle are lexically outside a def (and so executed at import time)

python/ql/src/Imports/UnintentionalImport.ql

@@ -13,6 +13,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate import_star(ImportStar imp, ModuleValue exporter) {
   exporter.importedAs(imp.getImportedModuleName())

python/ql/src/Metrics/Dependencies/ExternalDependenciesSourceLinks.ql

@@ -8,6 +8,7 @@
 
 import python
 import semmle.python.dependencies.TechInventory
+private import LegacyPointsTo
 
 /*
  * This query creates the source links for the ExternalDependencies.ql query.

python/ql/src/Metrics/DirectImports.ql

@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ModuleValue m, int n
 where n = count(ModuleValue imp | imp = m.getAnImportedModule())

python/ql/src/Metrics/TransitiveImports.ql

@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ModuleValue m, int n
 where n = count(ModuleValue imp | imp = m.getAnImportedModule+() and imp != m)

python/ql/src/Statements/DocStrings.ql

@@ -17,6 +17,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate needs_docstring(Scope s) {
   s.isPublic() and

python/ql/src/Statements/RedundantAssignment.ql

@@ -14,7 +14,6 @@
 
 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/Statements/SideEffectInAssert.ql

@@ -13,6 +13,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate func_with_side_effects(Expr e) {
   exists(string name | name = e.(Attribute).getName() or name = e.(Name).getId() |

python/ql/src/Statements/TopLevelPrint.ql

@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate main_eq_name(If i) {
   exists(Name n, StringLiteral m, Compare c |

python/ql/src/Statements/UnnecessaryDelete.ql

@@ -13,6 +13,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate isInsideLoop(AstNode node) {
   node.getParentNode() instanceof While

python/ql/src/Variables/Undefined.qll

@@ -1,6 +1,7 @@
 import python
 import Loop
 import semmle.python.dataflow.TaintTracking
+private import LegacyPointsTo
 
 /** A marker for "uninitialized". */
 class Uninitialized extends TaintKind {

python/ql/src/Variables/UndefinedPlaceHolder.ql

@@ -13,6 +13,7 @@
 
 import python
 import Variables.MonkeyPatched
+private import LegacyPointsTo
 
 /* Local variable part */
 predicate initialized_as_local(PlaceHolder use) {

python/ql/src/Variables/UnusedParameter.ql

@@ -14,6 +14,7 @@
 
 import python
 import Definition
+private import LegacyPointsTo
 
 predicate unused_parameter(FunctionValue f, LocalVariable v) {
   v.isParameter() and

python/ql/src/analysis/CallGraphEfficiency.ql

@@ -4,8 +4,7 @@
  */
 
 import python
-import semmle.python.pointsto.PointsTo
+private import LegacyPointsTo
-import semmle.python.pointsto.PointsToContext
 
 from int total_facts, int total_size, int depth, float efficiency
 where

python/ql/src/analysis/CallGraphMarginalEfficiency.ql

@@ -4,8 +4,7 @@
  */
 
 import python
-import semmle.python.pointsto.PointsTo
+private import LegacyPointsTo
-import semmle.python.pointsto.PointsToContext
 
 from int total_facts, int total_size, int depth, float efficiency
 where

python/ql/src/analysis/ContextEfficiency.ql

@@ -4,8 +4,7 @@
  */
 
 import python
-import semmle.python.pointsto.PointsTo
+private import LegacyPointsTo
-import semmle.python.pointsto.PointsToContext
 
 from int total_facts, int total_size, int depth, float efficiency
 where

python/ql/src/analysis/ContextMarginalEfficiency.ql

@@ -4,8 +4,7 @@
  */
 
 import python
-import semmle.python.pointsto.PointsTo
+private import LegacyPointsTo
-import semmle.python.pointsto.PointsToContext
 
 int depth(ControlFlowNode f, Object value, ClassObject cls) {
   exists(PointsToContext ctx |

python/ql/src/analysis/CrossProjectDefinitions.qll

@@ -3,7 +3,7 @@
  */
 
 import python
-import semmle.python.pointsto.PointsTo
+private import LegacyPointsTo
 
 private newtype TSymbol =
   TModule(Module m) or

python/ql/src/analysis/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/src/analysis/TypeHierarchyFailure.ql

@@ -8,6 +8,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from Class cls, string reason
 where exists(ClassObject c | c.getPyClass() = cls | c.failedInference(reason))

python/ql/src/meta/analysis-quality/CallGraphQuality.qll

@@ -5,6 +5,7 @@
 
 import python
 import meta.MetaMetrics
+private import LegacyPointsTo
 
 newtype TTarget =
   TFunction(Function func) or