Python: Fix Python 2 tests

tausbn · tausbn · commit 85029bd77d4b · 2025-11-26T12:30:30.000Z
diff --git a/python/ql/test/2/extractor-tests/import_depth/test.ql b/python/ql/test/2/extractor-tests/import_depth/test.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ModuleObject m
 /* Exclude the builtins module as it has a different name under 2 and 3. */
diff --git a/python/ql/test/2/extractor-tests/object_hash/Success.ql b/python/ql/test/2/extractor-tests/object_hash/Success.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 where exists(theSysModuleObject())
 select 1
diff --git a/python/ql/test/2/library-tests/ControlFlow/Exceptions/Handles.ql b/python/ql/test/2/library-tests/ControlFlow/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/2/library-tests/ControlFlow/Exceptions/Known.ql b/python/ql/test/2/library-tests/ControlFlow/Exceptions/Known.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from RaisingNode r
 select r.getLocation().getStartLine(), r.toString(), r.getARaisedType().toString()
diff --git a/python/ql/test/2/library-tests/ControlFlow/Exceptions/Likely.ql b/python/ql/test/2/library-tests/ControlFlow/Exceptions/Likely.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ControlFlowNode r, ControlFlowNode s
 where
diff --git a/python/ql/test/2/library-tests/ControlFlow/Exceptions/Unknown.ql b/python/ql/test/2/library-tests/ControlFlow/Exceptions/Unknown.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from RaisingNode r
 where r.raisesUnknownType()
diff --git a/python/ql/test/2/library-tests/PointsTo/import_time/Pruned.ql b/python/ql/test/2/library-tests/PointsTo/import_time/Pruned.ql
@@ -1,6 +1,5 @@
 import python
-import semmle.python.pointsto.PointsTo
-import semmle.python.pointsto.PointsToContext
+private import LegacyPointsTo
 
 from ControlFlowNode f, Location l, Context c
 where
diff --git a/python/ql/test/2/library-tests/PointsTo/metaclass/test.ql b/python/ql/test/2/library-tests/PointsTo/metaclass/test.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls
 where not cls.isC()
diff --git a/python/ql/test/2/library-tests/classes/attr/class_attr.ql b/python/ql/test/2/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/2/library-tests/classes/attr/class_has_attr.ql b/python/ql/test/2/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/2/library-tests/classes/attr/list_attr.ql b/python/ql/test/2/library-tests/classes/attr/list_attr.ql
@@ -5,6 +5,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, string name, Object what
 where
diff --git a/python/ql/test/2/library-tests/classes/mro/mro.ql b/python/ql/test/2/library-tests/classes/mro/mro.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, ClassObject l, ClassObject r
 where
diff --git a/python/ql/test/2/library-tests/modules/general/moduleobject_test.ql b/python/ql/test/2/library-tests/modules/general/moduleobject_test.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ModuleObject m, string name
 where m.getName() = "package" or m.getName() = "confused_elements"
diff --git a/python/ql/test/2/library-tests/modules/package_members/module_attributes.ql b/python/ql/test/2/library-tests/modules/package_members/module_attributes.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ModuleObject m, string name
 where not m.isC()
diff --git a/python/ql/test/2/library-tests/modules/package_members/module_exports.ql b/python/ql/test/2/library-tests/modules/package_members/module_exports.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ModuleObject m, string name
 where not m.isC() and m.exports(name)
diff --git a/python/ql/test/2/library-tests/modules/package_members/module_import_as.ql b/python/ql/test/2/library-tests/modules/package_members/module_import_as.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ModuleObject m, string name
 where not m.isC() and m.importedAs(name)
diff --git a/python/ql/test/2/library-tests/modules/usage/ModuleUsage.ql b/python/ql/test/2/library-tests/modules/usage/ModuleUsage.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ModuleValue mv, string usage
 where
diff --git a/python/ql/test/2/library-tests/types/classes/mro_test.ql b/python/ql/test/2/library-tests/types/classes/mro_test.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls
 where not cls.isC()
diff --git a/python/ql/test/2/library-tests/types/classes/new_style.ql b/python/ql/test/2/library-tests/types/classes/new_style.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, string style
 where
diff --git a/python/ql/test/2/library-tests/types/exceptions/ExitRaises.ql b/python/ql/test/2/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)
diff --git a/python/ql/test/2/library-tests/types/exceptions/Raises.ql b/python/ql/test/2/library-tests/types/exceptions/Raises.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from PyFunctionObject f, string type
 where
diff --git a/python/ql/test/2/library-tests/types/functions/Calls.ql b/python/ql/test/2/library-tests/types/functions/Calls.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from FunctionObject func, ControlFlowNode call
 where func.getACall() = call
diff --git a/python/ql/test/2/library-tests/types/functions/Never.ql b/python/ql/test/2/library-tests/types/functions/Never.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from FunctionObject func
 where func.neverReturns()
diff --git a/python/ql/test/2/library-tests/types/functions/ReturnTypes.ql b/python/ql/test/2/library-tests/types/functions/ReturnTypes.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from PyFunctionObject func, ClassObject ret_type
 where func.getAnInferredReturnType() = ret_type
diff --git a/python/ql/test/2/library-tests/types/properties/BuiltinProperties.ql b/python/ql/test/2/library-tests/types/properties/BuiltinProperties.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, string name, BuiltinPropertyObject p
 where

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 ModuleObject m`
`4`	`5`	`/* Exclude the builtins module as it has a different name under 2 and 3. */`