Python: Fix imports in tests

tausbn · tausbn · commit 5dadb0f476a4 · 2020-11-02T23:02:29.000+01:00
diff --git a/python/ql/test/experimental/dataflow/basic/allFlowsConfig.qll b/python/ql/test/experimental/dataflow/basic/allFlowsConfig.qll
@@ -1,4 +1,4 @@
-import experimental.dataflow.DataFlow
+import semmle.python.dataflow.new.DataFlow
 
 /**
  * A configuration to find all flows.
diff --git a/python/ql/test/experimental/dataflow/basic/local.ql b/python/ql/test/experimental/dataflow/basic/local.ql
@@ -1,4 +1,4 @@
-import experimental.dataflow.DataFlow
+import semmle.python.dataflow.new.DataFlow
 
 from DataFlow::Node fromNode, DataFlow::Node toNode
 where DataFlow::localFlow(fromNode, toNode)
diff --git a/python/ql/test/experimental/dataflow/basic/localStep.ql b/python/ql/test/experimental/dataflow/basic/localStep.ql
@@ -1,4 +1,4 @@
-import experimental.dataflow.DataFlow
+import semmle.python.dataflow.new.DataFlow
 
 from DataFlow::Node fromNode, DataFlow::Node toNode
 where DataFlow::localFlowStep(fromNode, toNode)
diff --git a/python/ql/test/experimental/dataflow/basic/maximalFlowsConfig.qll b/python/ql/test/experimental/dataflow/basic/maximalFlowsConfig.qll
@@ -1,5 +1,5 @@
-import experimental.dataflow.DataFlow
-private import experimental.dataflow.internal.DataFlowPrivate as DataFlowPrivate
+import semmle.python.dataflow.new.DataFlow
+private import semmle.python.dataflow.new.internal.DataFlowPrivate as DataFlowPrivate
 
 /**
  * A configuration to find all "maximal" flows.
diff --git a/python/ql/test/experimental/dataflow/callGraphConfig.qll b/python/ql/test/experimental/dataflow/callGraphConfig.qll
@@ -1,6 +1,6 @@
 private import python
-import experimental.dataflow.DataFlow
-private import experimental.dataflow.internal.DataFlowPrivate as DataFlowPrivate
+import semmle.python.dataflow.new.DataFlow
+private import semmle.python.dataflow.new.internal.DataFlowPrivate as DataFlowPrivate
 
 /**
  * A configuration to find the call graph edges.
diff --git a/python/ql/test/experimental/dataflow/consistency/dataflow-consistency.ql b/python/ql/test/experimental/dataflow/consistency/dataflow-consistency.ql
@@ -1 +1 @@
-import experimental.dataflow.internal.DataFlowImplConsistency::Consistency
+import semmle.python.dataflow.new.internal.DataFlowImplConsistency::Consistency
diff --git a/python/ql/test/experimental/dataflow/coverage/argumentRouting1.ql b/python/ql/test/experimental/dataflow/coverage/argumentRouting1.ql
@@ -3,9 +3,9 @@
  */
 
 import python
-import experimental.dataflow.DataFlow
+import semmle.python.dataflow.new.DataFlow
 import DataFlow::PathGraph
-private import experimental.dataflow.internal.DataFlowPrivate as DataFlowPrivate
+private import semmle.python.dataflow.new.internal.DataFlowPrivate as DataFlowPrivate
 
 /**
  * A configuration to check routing of arguments through magic methods.
diff --git a/python/ql/test/experimental/dataflow/coverage/argumentRouting2.ql b/python/ql/test/experimental/dataflow/coverage/argumentRouting2.ql
@@ -3,7 +3,7 @@
  */
 
 import python
-import experimental.dataflow.DataFlow
+import semmle.python.dataflow.new.DataFlow
 import DataFlow::PathGraph
 
 /**
diff --git a/python/ql/test/experimental/dataflow/coverage/argumentRouting3.ql b/python/ql/test/experimental/dataflow/coverage/argumentRouting3.ql
@@ -3,7 +3,7 @@
  */
 
 import python
-import experimental.dataflow.DataFlow
+import semmle.python.dataflow.new.DataFlow
 import DataFlow::PathGraph
 
 /**
diff --git a/python/ql/test/experimental/dataflow/coverage/argumentRouting4.ql b/python/ql/test/experimental/dataflow/coverage/argumentRouting4.ql
@@ -3,7 +3,7 @@
  */
 
 import python
-import experimental.dataflow.DataFlow
+import semmle.python.dataflow.new.DataFlow
 import DataFlow::PathGraph
 
 /**
diff --git a/python/ql/test/experimental/dataflow/coverage/argumentRouting5.ql b/python/ql/test/experimental/dataflow/coverage/argumentRouting5.ql
@@ -3,7 +3,7 @@
  */
 
 import python
-import experimental.dataflow.DataFlow
+import semmle.python.dataflow.new.DataFlow
 import DataFlow::PathGraph
 
 /**
diff --git a/python/ql/test/experimental/dataflow/coverage/argumentRouting6.ql b/python/ql/test/experimental/dataflow/coverage/argumentRouting6.ql
@@ -3,7 +3,7 @@
  */
 
 import python
-import experimental.dataflow.DataFlow
+import semmle.python.dataflow.new.DataFlow
 import DataFlow::PathGraph
 
 /**
diff --git a/python/ql/test/experimental/dataflow/coverage/argumentRouting7.ql b/python/ql/test/experimental/dataflow/coverage/argumentRouting7.ql
@@ -3,7 +3,7 @@
  */
 
 import python
-import experimental.dataflow.DataFlow
+import semmle.python.dataflow.new.DataFlow
 import DataFlow::PathGraph
 
 /**
diff --git a/python/ql/test/experimental/dataflow/coverage/classesCallGraph.ql b/python/ql/test/experimental/dataflow/coverage/classesCallGraph.ql
@@ -1,5 +1,5 @@
-import experimental.dataflow.DataFlow
-private import experimental.dataflow.internal.DataFlowPrivate as DataFlowPrivate
+import semmle.python.dataflow.new.DataFlow
+private import semmle.python.dataflow.new.internal.DataFlowPrivate as DataFlowPrivate
 
 /**
  * A configuration to find the call graph edges.
diff --git a/python/ql/test/experimental/dataflow/coverage/localFlow.ql b/python/ql/test/experimental/dataflow/coverage/localFlow.ql
@@ -1,5 +1,5 @@
 import python
-import experimental.dataflow.DataFlow
+import semmle.python.dataflow.new.DataFlow
 
 from DataFlow::Node nodeFrom, DataFlow::Node nodeTo
 where
diff --git a/python/ql/test/experimental/dataflow/fieldflow/allLocalFlow.ql b/python/ql/test/experimental/dataflow/fieldflow/allLocalFlow.ql
@@ -1,5 +1,5 @@
 import python
-import experimental.dataflow.DataFlow
+import semmle.python.dataflow.new.DataFlow
 
 from DataFlow::Node nodeFrom, DataFlow::Node nodeTo
 where
diff --git a/python/ql/test/experimental/dataflow/fieldflow/localFlow.ql b/python/ql/test/experimental/dataflow/fieldflow/localFlow.ql
@@ -1,5 +1,5 @@
 import python
-import experimental.dataflow.DataFlow
+import semmle.python.dataflow.new.DataFlow
 
 from DataFlow::Node nodeFrom, DataFlow::Node nodeTo
 where
diff --git a/python/ql/test/experimental/dataflow/global-flow/accesses.ql b/python/ql/test/experimental/dataflow/global-flow/accesses.ql
@@ -1,5 +1,5 @@
 import python
-import experimental.dataflow.DataFlow
+import semmle.python.dataflow.new.DataFlow
 import TestUtilities.InlineExpectationsTest
 
 class GlobalReadTest extends InlineExpectationsTest {
diff --git a/python/ql/test/experimental/dataflow/import-helper/ImportHelper.ql b/python/ql/test/experimental/dataflow/import-helper/ImportHelper.ql
@@ -1,4 +1,4 @@
 import python
-import experimental.dataflow.DataFlow
+import semmle.python.dataflow.new.DataFlow
 
 query predicate importNode(DataFlow::Node res, string name) { res = DataFlow::importNode(name) }
diff --git a/python/ql/test/experimental/dataflow/regression/custom_dataflow.ql b/python/ql/test/experimental/dataflow/regression/custom_dataflow.ql
@@ -8,7 +8,7 @@
  */
 
 import python
-import experimental.dataflow.DataFlow
+import semmle.python.dataflow.new.DataFlow
 
 class CustomTestConfiguration extends DataFlow::Configuration {
   CustomTestConfiguration() { this = "CustomTestConfiguration" }
diff --git a/python/ql/test/experimental/dataflow/strange-essaflow/testFlow.ql b/python/ql/test/experimental/dataflow/strange-essaflow/testFlow.ql
@@ -1,6 +1,6 @@
 import python
-import experimental.dataflow.DataFlow
-private import experimental.dataflow.internal.DataFlowPrivate as DataFlowPrivate
+import semmle.python.dataflow.new.DataFlow
+private import semmle.python.dataflow.new.internal.DataFlowPrivate as DataFlowPrivate
 
 /** Gets the EssaNode that holds the module imported by the fully qualified module name `name` */
 DataFlow::EssaNode module_import(string name) {
diff --git a/python/ql/test/experimental/dataflow/tainttracking/TestTaintLib.qll b/python/ql/test/experimental/dataflow/tainttracking/TestTaintLib.qll
@@ -1,6 +1,6 @@
 import python
-import experimental.dataflow.TaintTracking
-import experimental.dataflow.DataFlow
+import semmle.python.dataflow.new.TaintTracking
+import semmle.python.dataflow.new.DataFlow
 
 class TestTaintTrackingConfiguration extends TaintTracking::Configuration {
   TestTaintTrackingConfiguration() { this = "TestTaintTrackingConfiguration" }
diff --git a/python/ql/test/experimental/dataflow/tainttracking/basic/GlobalTaintTracking.ql b/python/ql/test/experimental/dataflow/tainttracking/basic/GlobalTaintTracking.ql
@@ -1,6 +1,6 @@
 import python
-import experimental.dataflow.TaintTracking
-import experimental.dataflow.DataFlow
+import semmle.python.dataflow.new.TaintTracking
+import semmle.python.dataflow.new.DataFlow
 
 class TestTaintTrackingConfiguration extends TaintTracking::Configuration {
   TestTaintTrackingConfiguration() { this = "TestTaintTrackingConfiguration" }
diff --git a/python/ql/test/experimental/dataflow/tainttracking/basic/LocalTaintStep.ql b/python/ql/test/experimental/dataflow/tainttracking/basic/LocalTaintStep.ql
@@ -1,6 +1,6 @@
 import python
-import experimental.dataflow.TaintTracking
-import experimental.dataflow.DataFlow
+import semmle.python.dataflow.new.TaintTracking
+import semmle.python.dataflow.new.DataFlow
 
 from DataFlow::Node nodeFrom, DataFlow::Node nodeTo
 where TaintTracking::localTaintStep(nodeFrom, nodeTo)
diff --git a/python/ql/test/experimental/dataflow/testConfig.qll b/python/ql/test/experimental/dataflow/testConfig.qll
@@ -21,7 +21,7 @@
  */
 
 private import python
-import experimental.dataflow.DataFlow
+import semmle.python.dataflow.new.DataFlow
 
 class TestConfiguration extends DataFlow::Configuration {
   TestConfiguration() { this = "TestConfiguration" }
diff --git a/python/ql/test/experimental/dataflow/typetracking/moduleattr.ql b/python/ql/test/experimental/dataflow/typetracking/moduleattr.ql
@@ -1,6 +1,6 @@
 import python
-import experimental.dataflow.DataFlow
-import experimental.dataflow.TypeTracker
+import semmle.python.dataflow.new.DataFlow
+import semmle.python.dataflow.new.TypeTracker
 
 DataFlow::Node module_tracker(TypeTracker t) {
   t.start() and
diff --git a/python/ql/test/experimental/dataflow/typetracking/tracked.ql b/python/ql/test/experimental/dataflow/typetracking/tracked.ql
@@ -1,6 +1,6 @@
 import python
-import experimental.dataflow.DataFlow
-import experimental.dataflow.TypeTracker
+import semmle.python.dataflow.new.DataFlow
+import semmle.python.dataflow.new.TypeTracker
 import TestUtilities.InlineExpectationsTest
 
 DataFlow::Node tracked(TypeTracker t) {
diff --git a/python/ql/test/experimental/library-tests/frameworks/django-v2-v3/TestTaint.ql b/python/ql/test/experimental/library-tests/frameworks/django-v2-v3/TestTaint.ql
@@ -1,5 +1,5 @@
 import experimental.dataflow.tainttracking.TestTaintLib
-import experimental.dataflow.RemoteFlowSources
+import semmle.python.dataflow.new.RemoteFlowSources
 
 class RemoteFlowTestTaintConfiguration extends TestTaintTrackingConfiguration {
   override predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
diff --git a/python/ql/test/experimental/library-tests/frameworks/flask/TestTaint.ql b/python/ql/test/experimental/library-tests/frameworks/flask/TestTaint.ql
@@ -1,5 +1,5 @@
 import experimental.dataflow.tainttracking.TestTaintLib
-import experimental.dataflow.RemoteFlowSources
+import semmle.python.dataflow.new.RemoteFlowSources
 
 class RemoteFlowTestTaintConfiguration extends TestTaintTrackingConfiguration {
   override predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
diff --git a/python/ql/test/experimental/library-tests/frameworks/modeling-example/NaiveModel.ql b/python/ql/test/experimental/library-tests/frameworks/modeling-example/NaiveModel.ql
@@ -3,8 +3,8 @@
  */
 
 private import python
-private import experimental.dataflow.DataFlow
-private import experimental.dataflow.TaintTracking
+private import semmle.python.dataflow.new.DataFlow
+private import semmle.python.dataflow.new.TaintTracking
 import DataFlow::PathGraph
 import SharedCode
 
diff --git a/python/ql/test/experimental/library-tests/frameworks/modeling-example/ProperModel.ql b/python/ql/test/experimental/library-tests/frameworks/modeling-example/ProperModel.ql
@@ -3,8 +3,8 @@
  */
 
 private import python
-private import experimental.dataflow.DataFlow
-private import experimental.dataflow.TaintTracking
+private import semmle.python.dataflow.new.DataFlow
+private import semmle.python.dataflow.new.TaintTracking
 import DataFlow::PathGraph
 import SharedCode
 
diff --git a/python/ql/test/experimental/library-tests/frameworks/modeling-example/SharedCode.qll b/python/ql/test/experimental/library-tests/frameworks/modeling-example/SharedCode.qll
@@ -1,6 +1,6 @@
 private import python
-private import experimental.dataflow.DataFlow
-private import experimental.dataflow.TaintTracking
+private import semmle.python.dataflow.new.DataFlow
+private import semmle.python.dataflow.new.TaintTracking
 
 // Helpers modeling MyClass
 /** A data-flow Node representing an instance of MyClass. */
diff --git a/python/ql/test/experimental/library-tests/frameworks/stdlib/TestTaint.ql b/python/ql/test/experimental/library-tests/frameworks/stdlib/TestTaint.ql
@@ -1,2 +1,2 @@
 import experimental.dataflow.tainttracking.TestTaintLib
-import experimental.dataflow.RemoteFlowSources
+import semmle.python.dataflow.new.RemoteFlowSources
diff --git a/python/ql/test/experimental/meta/ConceptsTest.qll b/python/ql/test/experimental/meta/ConceptsTest.qll
@@ -1,6 +1,6 @@
 import python
-import experimental.dataflow.DataFlow
-import experimental.semmle.python.Concepts
+import semmle.python.dataflow.new.DataFlow
+import semmle.python.Concepts
 import TestUtilities.InlineExpectationsTest
 
 string value_from_expr(Expr e) {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import experimental.dataflow.DataFlow`
	`1`	`+import semmle.python.dataflow.new.DataFlow`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* A configuration to find all flows.`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-import experimental.dataflow.internal.DataFlowImplConsistency::Consistency`
	`1`	`+import semmle.python.dataflow.new.internal.DataFlowImplConsistency::Consistency`