diff -r f47edf2b8954 -r af82cb6e0298 src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Imports/ImportsChecker.py
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Imports/ImportsChecker.py Fri Sep 01 10:27:56 2023 +0200
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Imports/ImportsChecker.py Fri Sep 01 15:31:04 2023 +0200
@@ -162,7 +162,7 @@
#######################################################################
## Tidy imports
##
- ## adapted from: flake8-tidy-imports v4.8.0
+ ## adapted from: flake8-tidy-imports v4.10.0
#######################################################################
def __tidyImports(self):
@@ -245,16 +245,16 @@
if importedName == alias.asname:
if fromName:
- rewritten = "from {0} import {1}".format(fromName, importedName)
+ rewritten = f"from {fromName} import {importedName}"
else:
- rewritten = "import {0}".format(importedName)
+ rewritten = f"import {importedName}"
self.__error(node.lineno - 1, node.col_offset, "I901", rewritten)
elif isinstance(node, ast.ImportFrom):
for alias in node.names:
if alias.name == alias.asname:
- rewritten = "from {0} import {1}".format(node.module, alias.name)
+ rewritten = f"from {node.module} import {alias.name}"
self.__error(node.lineno - 1, node.col_offset, "I901", rewritten)
@@ -293,7 +293,12 @@
@param node reference to the node to be checked
@type ast.AST
"""
- if not bool(self.__bannedModules):
+ if (
+ not bool(self.__bannedModules)
+ and not bool(self.__bannedUnstructuredPatterns)
+ and not bool(self.__bannedStructuredPatterns)
+ ):
+ # nothing to check
return
if isinstance(node, ast.Import):
@@ -329,6 +334,7 @@
@type ast.AST
"""
if not self.__banRelativeImports:
+ # nothing to check
return
elif self.__banRelativeImports == "parents":
@@ -339,8 +345,7 @@
msgCode = "I904"
if (
- self.__banRelativeImports
- and isinstance(node, ast.ImportFrom)
+ isinstance(node, ast.ImportFrom)
and node.level > minNodeLevel
):
self.__error(node.lineno - 1, node.col_offset, msgCode)
