Python: Fix Python 2 tests

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. */

python/ql/test/2/extractor-tests/object_hash/Success.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 where exists(theSysModuleObject())
 select 1

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, _, _)

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

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

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

python/ql/test/2/library-tests/PointsTo/import_time/Pruned.ql

@@ -1,6 +1,5 @@
 import python
-import semmle.python.pointsto.PointsTo
+private import LegacyPointsTo
-import semmle.python.pointsto.PointsToContext
 
 from ControlFlowNode f, Location l, Context c
 where

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

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

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

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

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

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"

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

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)

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)

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

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

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

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)

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

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

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

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

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