Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/generalHardcodedPassword.py	Sun Apr 11 16:53:48 2021 +0200
+++ b/eric6/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/generalHardcodedPassword.py	Sun Apr 11 18:45:10 2021 +0200
@@ -96,17 +96,19 @@
     elif isinstance(node._securityParent, ast.Compare):
         # looks for "candidate == 'some_string'"
         comp = node._securityParent
-        if isinstance(comp.left, ast.Name):
-            if RE_CANDIDATES.search(comp.left.id):
-                if AstUtilities.isString(comp.comparators[0]):
-                    reportError(
-                        context.node.lineno - 1,
-                        context.node.col_offset,
-                        "S105",
-                        "L",
-                        "M",
-                        comp.comparators[0].s
-                    )
+        if (
+            isinstance(comp.left, ast.Name) and
+            RE_CANDIDATES.search(comp.left.id) and
+            AstUtilities.isString(comp.comparators[0])
+        ):
+            reportError(
+                context.node.lineno - 1,
+                context.node.col_offset,
+                "S105",
+                "L",
+                "M",
+                comp.comparators[0].s
+            )
 
 
 def checkHardcodedPasswordAsFunctionArg(reportError, context, config):
@@ -153,13 +155,15 @@
     
     # go through all (param, value)s and look for candidates
     for key, val in zip(context.node.args.args, defs):
-        if isinstance(key, (ast.Name, ast.arg)):
-            if AstUtilities.isString(val) and RE_CANDIDATES.search(key.arg):
-                reportError(
-                    context.node.lineno - 1,
-                    context.node.col_offset,
-                    "S107",
-                    "L",
-                    "M",
-                    val.s
-                )
+        if (
+            isinstance(key, (ast.Name, ast.arg)) and
+            AstUtilities.isString(val) and RE_CANDIDATES.search(key.arg)
+        ):
+            reportError(
+                context.node.lineno - 1,
+                context.node.col_offset,
+                "S107",
+                "L",
+                "M",
+                val.s
+            )