Python: Promote data-flow libraries

Step 1: Moving stuff around. Also includes a bit of import renaming.

python/ql/src/semmle/python/Concepts.qll

@@ -5,10 +5,10 @@
  */
 
 import python
-private import experimental.dataflow.DataFlow
-private import experimental.dataflow.RemoteFlowSources
-private import experimental.dataflow.TaintTracking
-private import experimental.semmle.python.Frameworks
+private import semmle.python.dataflow.new.DataFlow
+private import semmle.python.dataflow.new.RemoteFlowSources
+private import semmle.python.dataflow.new.TaintTracking
+private import semmle.python.Frameworks
 
 /**
  * A data-flow node that executes an operating system command,

python/ql/src/semmle/python/dataflow/new/DataFlow.qll

@@ -22,5 +22,5 @@ private import python
  * global (inter-procedural) data flow analyses.
  */
 module DataFlow {
-  import experimental.dataflow.internal.DataFlowImpl
+  import internal.DataFlowImpl
 }

python/ql/src/semmle/python/dataflow/new/DataFlow2.qll

@@ -7,7 +7,7 @@
  * the source may reach the sink. We do not track flow across pointer
  * dereferences or array indexing. To track these types of flow, where the
  * exact value may not be preserved, import
- * `experimental.dataflow.TaintTracking`.
+ * `semmle.python.dataflow.new.TaintTracking`.
  *
  * To use global (interprocedural) data flow, extend the class
  * `DataFlow::Configuration` as documented on that class. To use local
@@ -22,5 +22,5 @@ private import python
  * global (inter-procedural) data flow analyses.
  */
 module DataFlow2 {
-  import experimental.dataflow.internal.DataFlowImpl2
+  import semmle.python.dataflow.new.internal.DataFlowImpl2
 }

python/ql/src/semmle/python/dataflow/new/RemoteFlowSources.qll

@@ -1,8 +1,8 @@
 private import python
-private import experimental.dataflow.DataFlow
+private import semmle.python.dataflow.new.DataFlow
 // Need to import since frameworks can extend `RemoteFlowSource::Range`
-private import experimental.semmle.python.Frameworks
-private import experimental.semmle.python.Concepts
+private import semmle.python.Frameworks
+private import semmle.python.Concepts
 
 /**
  * A data flow source of remote user input.

python/ql/src/semmle/python/dataflow/new/TaintTracking.qll

@@ -15,5 +15,5 @@ private import python
  * global (inter-procedural) taint-tracking analyses.
  */
 module TaintTracking {
-  import experimental.dataflow.internal.tainttracking1.TaintTrackingImpl
+  import internal.tainttracking1.TaintTrackingImpl
 }

python/ql/src/semmle/python/dataflow/new/TaintTracking2.qll

@@ -15,5 +15,5 @@ private import python
  * global (inter-procedural) taint-tracking analyses.
  */
 module TaintTracking2 {
-  import experimental.dataflow.internal.tainttracking2.TaintTrackingImpl
+  import semmle.python.dataflow.new.internal.tainttracking2.TaintTrackingImpl
 }

python/ql/src/semmle/python/dataflow/new/internal/DataFlowPublic.qll

@@ -4,7 +4,7 @@
 
 private import python
 private import DataFlowPrivate
-import experimental.dataflow.TypeTracker
+import semmle.python.dataflow.new.TypeTracker
 import Attributes
 private import semmle.python.essa.SsaCompute
 

python/ql/src/semmle/python/dataflow/new/internal/TaintTrackingPrivate.qll

@@ -1,7 +1,7 @@
 private import python
-private import experimental.dataflow.DataFlow
-private import experimental.dataflow.internal.DataFlowPrivate
-private import experimental.dataflow.internal.TaintTrackingPublic
+private import semmle.python.dataflow.new.DataFlow
+private import semmle.python.dataflow.new.internal.DataFlowPrivate
+private import semmle.python.dataflow.new.internal.TaintTrackingPublic
 
 /**
  * Holds if `node` should be a sanitizer in all global taint flow configurations

python/ql/src/semmle/python/dataflow/new/internal/TaintTrackingPublic.qll

@@ -5,9 +5,9 @@
 
 private import python
 private import TaintTrackingPrivate
-private import experimental.dataflow.DataFlow
+private import semmle.python.dataflow.new.DataFlow
 // Need to import since frameworks can extend `AdditionalTaintStep`
-private import experimental.semmle.python.Frameworks
+private import semmle.python.Frameworks
 
 // Local taint flow and helpers
 /**

python/ql/src/semmle/python/frameworks/Dill.qll

@@ -4,9 +4,9 @@
  */
 
 private import python
-private import experimental.dataflow.DataFlow
-private import experimental.dataflow.RemoteFlowSources
-private import experimental.semmle.python.Concepts
+private import semmle.python.dataflow.new.DataFlow
+private import semmle.python.dataflow.new.RemoteFlowSources
+private import semmle.python.Concepts
 
 private module Dill {
   /** Gets a reference to the `dill` module. */

python/ql/src/semmle/python/frameworks/Django.qll

@@ -4,11 +4,11 @@
  */
 
 private import python
-private import experimental.dataflow.DataFlow
-private import experimental.dataflow.RemoteFlowSources
-private import experimental.dataflow.TaintTracking
-private import experimental.semmle.python.Concepts
-private import experimental.semmle.python.frameworks.PEP249
+private import semmle.python.dataflow.new.DataFlow
+private import semmle.python.dataflow.new.RemoteFlowSources
+private import semmle.python.dataflow.new.TaintTracking
+private import semmle.python.Concepts
+private import semmle.python.frameworks.PEP249
 private import semmle.python.regex
 
 /**

python/ql/src/semmle/python/frameworks/Fabric.qll

@@ -8,9 +8,9 @@
  */
 
 private import python
-private import experimental.dataflow.DataFlow
-private import experimental.dataflow.RemoteFlowSources
-private import experimental.semmle.python.Concepts
+private import semmle.python.dataflow.new.DataFlow
+private import semmle.python.dataflow.new.RemoteFlowSources
+private import semmle.python.Concepts
 
 /**
  * Provides classes modeling security-relevant aspects of the `fabric` PyPI package, for

python/ql/src/semmle/python/frameworks/Flask.qll

@@ -4,11 +4,11 @@
  */
 
 private import python
-private import experimental.dataflow.DataFlow
-private import experimental.dataflow.RemoteFlowSources
-private import experimental.dataflow.TaintTracking
-private import experimental.semmle.python.Concepts
-private import experimental.semmle.python.frameworks.Werkzeug
+private import semmle.python.dataflow.new.DataFlow
+private import semmle.python.dataflow.new.RemoteFlowSources
+private import semmle.python.dataflow.new.TaintTracking
+private import semmle.python.Concepts
+private import semmle.python.frameworks.Werkzeug
 
 /**
  * Provides models for the `flask` PyPI package.

python/ql/src/semmle/python/frameworks/Invoke.qll

@@ -4,8 +4,8 @@
  */
 
 private import python
-private import experimental.dataflow.DataFlow
-private import experimental.semmle.python.Concepts
+private import semmle.python.dataflow.new.DataFlow
+private import semmle.python.Concepts
 
 /**
  * Provides models for the `invoke` PyPI package.

python/ql/src/semmle/python/frameworks/MySQLdb.qll

@@ -6,9 +6,9 @@
  */
 
 private import python
-private import experimental.dataflow.DataFlow
-private import experimental.dataflow.RemoteFlowSources
-private import experimental.semmle.python.Concepts
+private import semmle.python.dataflow.new.DataFlow
+private import semmle.python.dataflow.new.RemoteFlowSources
+private import semmle.python.Concepts
 private import PEP249
 
 /**

python/ql/src/semmle/python/frameworks/MysqlConnectorPython.qll

@@ -6,9 +6,9 @@
  */
 
 private import python
-private import experimental.dataflow.DataFlow
-private import experimental.dataflow.RemoteFlowSources
-private import experimental.semmle.python.Concepts
+private import semmle.python.dataflow.new.DataFlow
+private import semmle.python.dataflow.new.RemoteFlowSources
+private import semmle.python.Concepts
 private import PEP249
 
 /**

python/ql/src/semmle/python/frameworks/PEP249.qll

@@ -4,9 +4,9 @@
  */
 
 private import python
-private import experimental.dataflow.DataFlow
-private import experimental.dataflow.RemoteFlowSources
-private import experimental.semmle.python.Concepts
+private import semmle.python.dataflow.new.DataFlow
+private import semmle.python.dataflow.new.RemoteFlowSources
+private import semmle.python.Concepts
 
 /** A module implementing PEP 249. Extend this class for implementations. */
 abstract class PEP249Module extends DataFlow::Node { }

python/ql/src/semmle/python/frameworks/Stdlib.qll

@@ -4,10 +4,10 @@
  */
 
 private import python
-private import experimental.dataflow.DataFlow
-private import experimental.dataflow.TaintTracking
-private import experimental.dataflow.RemoteFlowSources
-private import experimental.semmle.python.Concepts
+private import semmle.python.dataflow.new.DataFlow
+private import semmle.python.dataflow.new.TaintTracking
+private import semmle.python.dataflow.new.RemoteFlowSources
+private import semmle.python.Concepts
 
 /** Provides models for the Python standard library. */
 private module Stdlib {

python/ql/src/semmle/python/frameworks/Werkzeug.qll

@@ -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
 
 module Werkzeug {
   /** Provides models for the `werkzeug` module. */

python/ql/src/semmle/python/frameworks/Yaml.qll

@@ -4,9 +4,9 @@
  */
 
 private import python
-private import experimental.dataflow.DataFlow
-private import experimental.dataflow.RemoteFlowSources
-private import experimental.semmle.python.Concepts
+private import semmle.python.dataflow.new.DataFlow
+private import semmle.python.dataflow.new.RemoteFlowSources
+private import semmle.python.Concepts
 
 private module Yaml {
   /** Gets a reference to the `yaml` module. */