Skip to content

Commit b05ac51

Browse files
DanielNoordPierre-Sassoulas
authored andcommitted
Pin colorama to lowest supported version (#6970)
1 parent 417e8c3 commit b05ac51

File tree

3 files changed

+15
-27
lines changed

3 files changed

+15
-27
lines changed

doc/whatsnew/2/2.14/full.rst

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ Release date: TBA
1414

1515
Closes #2270
1616

17+
* Allow suppressing ``undefined-loop-variable`` and ``undefined-variable`` without raising ``useless-suppression``.
18+
1719
* Fixed false positive for ``undefined-variable`` for ``__class__`` in inner methods.
1820

1921
Closes #4032

pylint/checkers/variables.py

+12-26
Original file line numberDiff line numberDiff line change
@@ -1081,15 +1081,6 @@ def __init__(self, linter=None):
10811081
"""This is a queue, last in first out."""
10821082
self._postponed_evaluation_enabled = False
10831083

1084-
def open(self) -> None:
1085-
"""Called when loading the checker."""
1086-
self._is_undefined_variable_enabled = self.linter.is_message_enabled(
1087-
"undefined-variable"
1088-
)
1089-
self._is_undefined_loop_variable_enabled = self.linter.is_message_enabled(
1090-
"undefined-loop-variable"
1091-
)
1092-
10931084
def leave_for(self, node: nodes.For) -> None:
10941085
self._store_type_annotation_names(node)
10951086

@@ -1353,8 +1344,7 @@ def visit_name(self, node: nodes.Name) -> None:
13531344
return
13541345

13551346
self._undefined_and_used_before_checker(node, stmt)
1356-
if self._is_undefined_loop_variable_enabled:
1357-
self._loopvar_name(node)
1347+
self._loopvar_name(node)
13581348

13591349
@utils.only_required_for_messages("redefined-outer-name")
13601350
def visit_excepthandler(self, node: nodes.ExceptHandler) -> None:
@@ -1411,23 +1401,19 @@ def _undefined_and_used_before_checker(
14111401

14121402
# we have not found the name, if it isn't a builtin, that's an
14131403
# undefined name !
1414-
if (
1415-
self._is_undefined_variable_enabled
1416-
and not (
1417-
node.name in nodes.Module.scope_attrs
1418-
or utils.is_builtin(node.name)
1419-
or node.name in self.linter.config.additional_builtins
1420-
or (
1421-
node.name == "__class__"
1422-
and any(
1423-
i.is_method()
1424-
for i in node.node_ancestors()
1425-
if isinstance(i, nodes.FunctionDef)
1426-
)
1404+
if not (
1405+
node.name in nodes.Module.scope_attrs
1406+
or utils.is_builtin(node.name)
1407+
or node.name in self.linter.config.additional_builtins
1408+
or (
1409+
node.name == "__class__"
1410+
and any(
1411+
i.is_method()
1412+
for i in node.node_ancestors()
1413+
if isinstance(i, nodes.FunctionDef)
14271414
)
14281415
)
1429-
and not utils.node_ignores_exception(node, NameError)
1430-
):
1416+
) and not utils.node_ignores_exception(node, NameError):
14311417
self.add_message("undefined-variable", args=node.name, node=node)
14321418

14331419
def _should_node_be_skipped(

setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ install_requires =
5252
mccabe>=0.6,<0.8
5353
tomli>=1.1.0;python_version<"3.11"
5454
tomlkit>=0.10.1
55-
colorama;sys_platform=="win32"
55+
colorama>=0.4.5;sys_platform=="win32"
5656
typing-extensions>=3.10.0;python_version<"3.10"
5757
python_requires = >=3.7.2
5858

0 commit comments

Comments
 (0)