Merge pull request #8796 from erik-krogh/redundantImport

Remove redundant imports
2026-05-03 04:39:29 +02:00 · 2022-04-27 12:39:51 +02:00
parent 9d774463f5 7dba2b5868
commit e1c7d369be
114 changed files with 87 additions and 120 deletions
--- a/python/ql/lib/semmle/python/Module.qll
+++ b/python/ql/lib/semmle/python/Module.qll
@@ -1,5 +1,4 @@
 import python
-private import semmle.python.objects.ObjectAPI
 private import semmle.python.objects.Modules
 private import semmle.python.internal.CachedStages

--- a/python/ql/lib/semmle/python/dataflow/old/StateTracking.qll
+++ b/python/ql/lib/semmle/python/dataflow/old/StateTracking.qll
@@ -9,7 +9,6 @@
 */

 import python
-private import semmle.python.pointsto.Base
 private import semmle.python.pointsto.PointsTo
 private import semmle.python.pointsto.PointsToContext
 private import semmle.python.objects.ObjectInternal
--- a/python/ql/lib/semmle/python/essa/SsaDefinitions.qll
+++ b/python/ql/lib/semmle/python/essa/SsaDefinitions.qll
@@ -4,7 +4,6 @@
 */

 import python
-private import semmle.python.pointsto.Base
 private import semmle.python.internal.CachedStages

 cached
--- a/python/ql/lib/semmle/python/frameworks/Requests.qll
+++ b/python/ql/lib/semmle/python/frameworks/Requests.qll
@@ -9,7 +9,6 @@
 private import python
 private import semmle.python.Concepts
 private import semmle.python.ApiGraphs
-private import semmle.python.dataflow.new.DataFlow
 private import semmle.python.dataflow.new.TaintTracking
 private import semmle.python.frameworks.internal.InstanceTaintStepsHelper
 private import semmle.python.frameworks.Stdlib
--- a/python/ql/lib/semmle/python/objects/Modules.qll
+++ b/python/ql/lib/semmle/python/objects/Modules.qll
@@ -136,6 +136,7 @@ class PackageObjectInternal extends ModuleObjectInternal, TPackageObject {
  /** Gets the init module of this package */
  PythonModuleObjectInternal getInitModule() { result = TPythonModule(this.getSourceModule()) }

+  /** Holds if the folder for this package has no init module. */
  predicate hasNoInitModule() {
    exists(Folder f |
      f = this.getFolder() and
--- a/python/ql/lib/semmle/python/types/FunctionObject.qll
+++ b/python/ql/lib/semmle/python/types/FunctionObject.qll
@@ -3,7 +3,6 @@ import semmle.python.types.Exceptions
 private import semmle.python.pointsto.PointsTo
 private import semmle.python.objects.Callables
 private import semmle.python.libraries.Zope
-private import semmle.python.pointsto.Base
 private import semmle.python.objects.ObjectInternal
 private import semmle.python.types.Builtins

--- a/python/ql/lib/semmle/python/types/Object.qll
+++ b/python/ql/lib/semmle/python/types/Object.qll
@@ -1,5 +1,4 @@
 import python
-private import semmle.python.objects.ObjectAPI
 private import semmle.python.objects.ObjectInternal
 private import semmle.python.types.Builtins
 private import semmle.python.internal.CachedStages
--- a/python/ql/lib/semmle/python/web/falcon/Request.qll
+++ b/python/ql/lib/semmle/python/web/falcon/Request.qll
@@ -2,7 +2,6 @@ import python
 import semmle.python.dataflow.TaintTracking
 import semmle.python.web.Http
 import semmle.python.web.falcon.General
-import semmle.python.security.strings.External

 /** https://falcon.readthedocs.io/en/stable/api/request_and_response.html */
 deprecated class FalconRequest extends TaintKind {
--- a/python/ql/lib/semmle/python/web/falcon/Response.qll
+++ b/python/ql/lib/semmle/python/web/falcon/Response.qll
@@ -2,7 +2,6 @@ import python
 import semmle.python.dataflow.TaintTracking
 import semmle.python.web.Http
 import semmle.python.web.falcon.General
-import semmle.python.security.strings.External

 /** https://falcon.readthedocs.io/en/stable/api/request_and_response.html */
 deprecated class FalconResponse extends TaintKind {
--- a/python/ql/lib/semmle/python/web/pyramid/Response.qll
+++ b/python/ql/lib/semmle/python/web/pyramid/Response.qll
@@ -3,7 +3,6 @@ import semmle.python.dataflow.TaintTracking
 import semmle.python.security.strings.Basic
 import semmle.python.web.Http
 private import semmle.python.web.pyramid.View
-private import semmle.python.web.Http

 /**
 * A pyramid response, which is vulnerable to any sort of
--- a/python/ql/src/Classes/DefineEqualsWhenAddingAttributes.ql
+++ b/python/ql/src/Classes/DefineEqualsWhenAddingAttributes.ql
@@ -11,7 +11,6 @@
 */

 import python
-import semmle.python.SelfAttribute
 import Equality

 predicate class_stores_to_attribute(ClassValue cls, SelfAttributeStore store, string name) {
--- a/python/ql/src/Classes/MaybeUndefinedClassAttribute.ql
+++ b/python/ql/src/Classes/MaybeUndefinedClassAttribute.ql
@@ -11,7 +11,6 @@
 */

 import python
-import semmle.python.SelfAttribute
 import ClassAttributes

 predicate guarded_by_other_attribute(SelfAttributeRead a, CheckClass c) {
--- a/python/ql/src/Classes/UndefinedClassAttribute.ql
+++ b/python/ql/src/Classes/UndefinedClassAttribute.ql
@@ -11,7 +11,6 @@
 */

 import python
-import semmle.python.SelfAttribute
 import ClassAttributes

 predicate undefined_class_attribute(SelfAttributeRead a, CheckClass c, int line, string name) {
--- a/python/ql/src/Expressions/Formatting/UnusedArgumentIn3101Format.ql
+++ b/python/ql/src/Expressions/Formatting/UnusedArgumentIn3101Format.ql
@@ -10,7 +10,6 @@
 * @id py/str-format/surplus-argument
 */

-import python
 import python
 import AdvancedFormatting

--- a/python/ql/src/Lexical/FCommentedOutCode.ql
+++ b/python/ql/src/Lexical/FCommentedOutCode.ql
@@ -10,7 +10,6 @@

 import python
 import Lexical.CommentedOutCode
-import python

 from File f, int n
 where n = count(CommentedOutCodeLine c | not c.maybeExampleCode() and c.getLocation().getFile() = f)
--- a/python/ql/src/Resources/FileOpen.qll
+++ b/python/ql/src/Resources/FileOpen.qll
@@ -1,7 +1,6 @@
 /** Contains predicates concerning when and where files are opened and closed. */

 import python
-import semmle.python.GuardedControlFlow
 import semmle.python.pointsto.Filters

 /** Holds if `open` is a call that returns a newly opened file */
--- a/python/ql/src/experimental/Security/CWE-348/ClientSuppliedIpUsedInSecurityCheckLib.qll
+++ b/python/ql/src/experimental/Security/CWE-348/ClientSuppliedIpUsedInSecurityCheckLib.qll
@@ -1,8 +1,8 @@
 private import python
 private import semmle.python.Concepts
 private import semmle.python.ApiGraphs
-private import semmle.python.dataflow.new.DataFlow
 private import semmle.python.dataflow.new.RemoteFlowSources
+private import semmle.python.dataflow.new.DataFlow

 /**
 * A data flow source of the client ip obtained according to the remote endpoint identifier specified
--- a/python/ql/test/library-tests/PointsTo/comparisons/PointsTo.ql
+++ b/python/ql/test/library-tests/PointsTo/comparisons/PointsTo.ql
@@ -1,5 +1,4 @@
 import python
-import semmle.python.objects.ObjectAPI

 from int line, ControlFlowNode f, Value v
 where
--- a/python/ql/test/library-tests/PointsTo/global/Global.ql
+++ b/python/ql/test/library-tests/PointsTo/global/Global.ql
@@ -1,5 +1,4 @@
 import python
-import python
 import semmle.python.pointsto.PointsTo
 import semmle.python.pointsto.PointsToContext
 import semmle.python.objects.ObjectInternal
--- a/python/ql/test/library-tests/PointsTo/inheritance/Declares.ql
+++ b/python/ql/test/library-tests/PointsTo/inheritance/Declares.ql
@@ -1,5 +1,4 @@
 import python
-import semmle.python.pointsto.Base

 from ClassObject cls, string name
 where class_declares_attribute(cls, name)
--- a/python/ql/test/library-tests/PointsTo/new/ClassMethod.ql
+++ b/python/ql/test/library-tests/PointsTo/new/ClassMethod.ql
@@ -1,5 +1,4 @@
 import python
-import semmle.python.types.Descriptors
 import Util

 from ClassMethodObject cm, CallNode call
--- a/python/ql/test/library-tests/PointsTo/new/PointsToMissing.ql
+++ b/python/ql/test/library-tests/PointsTo/new/PointsToMissing.ql
@@ -1,7 +1,6 @@
 import python
 import Util
 import semmle.python.pointsto.PointsTo
-import semmle.python.objects.ObjectInternal

 /* This test should return _no_ results. */
 predicate relevant_node(ControlFlowNode n) {
--- a/python/ql/test/library-tests/PointsTo/new/PointsToUnknown.ql
+++ b/python/ql/test/library-tests/PointsTo/new/PointsToUnknown.ql
@@ -1,7 +1,6 @@
 import python
 import Util
 import semmle.python.pointsto.PointsTo
-import semmle.python.objects.ObjectInternal

 from ControlFlowNode f, ControlFlowNode x
 where PointsTo::pointsTo(f, _, ObjectInternal::unknown(), x)
--- a/python/ql/test/library-tests/attributes/SelfAttribute.ql
+++ b/python/ql/test/library-tests/attributes/SelfAttribute.ql
@@ -1,5 +1,4 @@
 import python
-import semmle.python.SelfAttribute

 from SelfAttributeRead sa, int line, string g, string l
 where
--- a/python/ql/test/library-tests/descriptors/Methods.ql
+++ b/python/ql/test/library-tests/descriptors/Methods.ql
@@ -1,5 +1,4 @@
 import python
-import semmle.python.types.Descriptors

 int lineof(Object o) { result = o.getOrigin().getLocation().getStartLine() }

--- a/python/ql/test/library-tests/descriptors/Properties.ql
+++ b/python/ql/test/library-tests/descriptors/Properties.ql
@@ -1,5 +1,4 @@
 import python
-import semmle.python.types.Descriptors

 from PropertyValue p, string method_name, FunctionValue method
 where
--- a/python/ql/test/library-tests/security/command-execution/CommandSinks.expected
+++ b/python/ql/test/library-tests/security/command-execution/CommandSinks.expected
@@ -1,4 +1,4 @@
-WARNING: Type CommandSink has been deprecated and may be removed in future (CommandSinks.ql:5,6-17)
+WARNING: Type CommandSink has been deprecated and may be removed in future (CommandSinks.ql:4,6-17)
 | fabric_v1_test.py:8:7:8:28 | FabricV1Commands | externally controlled string |
 | fabric_v1_test.py:9:5:9:27 | FabricV1Commands | externally controlled string |
 | fabric_v1_test.py:10:6:10:38 | FabricV1Commands | externally controlled string |
--- a/python/ql/test/library-tests/security/command-execution/CommandSinks.ql
+++ b/python/ql/test/library-tests/security/command-execution/CommandSinks.ql
@@ -1,6 +1,5 @@
 import python
 import semmle.python.security.injection.Command
-import semmle.python.security.strings.Untrusted

 from CommandSink sink, TaintKind kind
 where sink.sinks(kind)
--- a/python/ql/test/library-tests/web/django/SqlInjectionSinks.ql
+++ b/python/ql/test/library-tests/web/django/SqlInjectionSinks.ql
@@ -2,7 +2,6 @@ import python
 import semmle.python.security.injection.Sql
 import semmle.python.web.django.Db
 import semmle.python.web.django.Model
-import semmle.python.security.strings.Untrusted

 from SqlInjectionSink sink, TaintKind kind
 where sink.sinks(kind)