diff options
| -rw-r--r-- | .pre-commit-config.yaml | 2 | ||||
| -rw-r--r-- | pylint/checkers/python3.py | 16 | ||||
| -rw-r--r-- | pylint/checkers/similar.py | 2 | ||||
| -rw-r--r-- | pylint/config/man_help_formatter.py | 2 | ||||
| -rw-r--r-- | pylint/lint/report_functions.py | 8 | ||||
| -rw-r--r-- | pylint/message/message_definition.py | 4 | ||||
| -rw-r--r-- | pylint/reporters/ureports/text_writer.py | 4 | ||||
| -rw-r--r-- | requirements_test_pre_commit.txt | 2 | ||||
| -rw-r--r-- | tests/unittest_pyreverse_diadefs.py | 6 |
9 files changed, 20 insertions, 26 deletions
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6e5096bb7..3283d96e5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,7 +21,7 @@ repos: - --remove-duplicate-keys - --remove-unused-variables - repo: https://github.com/asottile/pyupgrade - rev: v2.16.0 + rev: v2.18.1 hooks: - id: pyupgrade args: [--py36-plus] diff --git a/pylint/checkers/python3.py b/pylint/checkers/python3.py index d5b929b94..f61efa135 100644 --- a/pylint/checkers/python3.py +++ b/pylint/checkers/python3.py @@ -907,15 +907,13 @@ class Python3Checker(checkers.BaseChecker): ) _python_2_tests = frozenset( - [ - astroid.extract_node(x).repr_tree() - for x in [ - "sys.version_info[0] == 2", - "sys.version_info[0] < 3", - "sys.version_info == (2, 7)", - "sys.version_info <= (2, 7)", - "sys.version_info < (3, 0)", - ] + astroid.extract_node(x).repr_tree() + for x in [ + "sys.version_info[0] == 2", + "sys.version_info[0] < 3", + "sys.version_info == (2, 7)", + "sys.version_info <= (2, 7)", + "sys.version_info < (3, 0)", ] ) diff --git a/pylint/checkers/similar.py b/pylint/checkers/similar.py index 01caf91a3..fb0892c1a 100644 --- a/pylint/checkers/similar.py +++ b/pylint/checkers/similar.py @@ -122,7 +122,7 @@ class Similar: for line in lineset._real_lines[idx : idx + num]: print(" ", line.rstrip()) nb_lignes_dupliquees += num * (len(couples) - 1) - nb_total_lignes = sum([len(lineset) for lineset in self.linesets]) + nb_total_lignes = sum(len(lineset) for lineset in self.linesets) print( "TOTAL lines=%s duplicates=%s percent=%.2f" % ( diff --git a/pylint/config/man_help_formatter.py b/pylint/config/man_help_formatter.py index c465876f6..a7b227296 100644 --- a/pylint/config/man_help_formatter.py +++ b/pylint/config/man_help_formatter.py @@ -28,7 +28,7 @@ class _ManHelpFormatter(optparse.HelpFormatter): optstring = self.format_option_strings(option) if option.help: help_text = self.expand_default(option) - help_string = " ".join([line.strip() for line in help_text.splitlines()]) + help_string = " ".join(line.strip() for line in help_text.splitlines()) help_string = help_string.replace("\\", "\\\\") help_string = help_string.replace("[current:", "[default:") else: diff --git a/pylint/lint/report_functions.py b/pylint/lint/report_functions.py index 34afbde1e..d3a88a14c 100644 --- a/pylint/lint/report_functions.py +++ b/pylint/lint/report_functions.py @@ -22,11 +22,9 @@ def report_messages_stats(sect, stats, _): # don't print this report when we didn't detected any errors raise exceptions.EmptyReportError() in_order = sorted( - [ - (value, msg_id) - for msg_id, value in stats["by_msg"].items() - if not msg_id.startswith("I") - ] + (value, msg_id) + for msg_id, value in stats["by_msg"].items() + if not msg_id.startswith("I") ) in_order.reverse() lines = ("message id", "occurrences") diff --git a/pylint/message/message_definition.py b/pylint/message/message_definition.py index f286a1748..3b2e917b5 100644 --- a/pylint/message/message_definition.py +++ b/pylint/message/message_definition.py @@ -66,9 +66,9 @@ class MessageDefinition: if self.minversion or self.maxversion: restr = [] if self.minversion: - restr.append("< %s" % ".".join([str(n) for n in self.minversion])) + restr.append("< %s" % ".".join(str(n) for n in self.minversion)) if self.maxversion: - restr.append(">= %s" % ".".join([str(n) for n in self.maxversion])) + restr.append(">= %s" % ".".join(str(n) for n in self.maxversion)) restr = " or ".join(restr) if checkerref: desc += " It can't be emitted when using Python %s." % restr diff --git a/pylint/reporters/ureports/text_writer.py b/pylint/reporters/ureports/text_writer.py index 17272080b..e4f773879 100644 --- a/pylint/reporters/ureports/text_writer.py +++ b/pylint/reporters/ureports/text_writer.py @@ -69,8 +69,8 @@ class TextWriter(BaseWriter): format_strings = " ".join(["%%-%ss"] * len(cols_width)) format_strings = format_strings % tuple(cols_width) format_strings = format_strings.split(" ") - table_linesep = "\n+" + "+".join(["-" * w for w in cols_width]) + "+\n" - headsep = "\n+" + "+".join(["=" * w for w in cols_width]) + "+\n" + table_linesep = "\n+" + "+".join("-" * w for w in cols_width) + "+\n" + headsep = "\n+" + "+".join("=" * w for w in cols_width) + "+\n" self.write(table_linesep) for index, line in enumerate(table_content): diff --git a/requirements_test_pre_commit.txt b/requirements_test_pre_commit.txt index cd746090c..59c234eea 100644 --- a/requirements_test_pre_commit.txt +++ b/requirements_test_pre_commit.txt @@ -3,5 +3,5 @@ black==21.5b1;python_full_version>="3.6.2" flake8==3.9.2 isort==5.8.0 mypy==0.812 -pyupgrade==2.16.0;python_full_version>="3.6.1" +pyupgrade==2.18.1;python_full_version>="3.6.1" black-disable-checker==1.0.1 diff --git a/tests/unittest_pyreverse_diadefs.py b/tests/unittest_pyreverse_diadefs.py index e90db2251..8eb333fad 100644 --- a/tests/unittest_pyreverse_diadefs.py +++ b/tests/unittest_pyreverse_diadefs.py @@ -34,7 +34,7 @@ from pylint.pyreverse.inspector import Linker def _process_classes(classes): """extract class names of a list""" - return sorted([(isinstance(c.node, astroid.ClassDef), c.title) for c in classes]) + return sorted((isinstance(c.node, astroid.ClassDef), c.title) for c in classes) def _process_relations(relations): @@ -128,9 +128,7 @@ def test_known_values1(HANDLER, PROJECT): assert keys == ["package", "class"] pd = dd[0] assert pd.title == "packages No Name" - modules = sorted( - [(isinstance(m.node, astroid.Module), m.title) for m in pd.objects] - ) + modules = sorted((isinstance(m.node, astroid.Module), m.title) for m in pd.objects) assert modules == [ (True, "data"), (True, "data.clientmodule_test"), |