From acf10fdb494e7a7231d0a575372b5d2e62072b23 Mon Sep 17 00:00:00 2001
From: Avasam <samuel.06@hotmail.com>
Date: Tue, 20 Aug 2024 22:29:12 -0400
Subject: [PATCH] Ruff: enable all pyflakes and perf rules

---
 ruff.toml                          | 8 +++++---
 setuptools/command/easy_install.py | 2 +-
 setuptools/tests/test_manifest.py  | 8 +-------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/ruff.toml b/ruff.toml
index b55b4e8067..ddae5009ed 100644
--- a/ruff.toml
+++ b/ruff.toml
@@ -7,20 +7,22 @@ exclude = [
 [lint]
 extend-select = [
 	"C901",
-	"PERF401",
 	"W",
 
 	# local
 	"ANN2", # missing-return-type-*
-	"FA", # flake8-future-annotations
+	"F", # Pyflakes
 	"F404", # late-future-import
+	"FA", # flake8-future-annotations
 	"I", # isort
+	"PERF", # Perflint
 	"PYI", # flake8-pyi
+	"TRY", # tryceratops
 	"UP", # pyupgrade
-	"TRY",
 	"YTT", # flake8-2020
 ]
 ignore = [
+	"PERF203", # try-except-in-loop, micro-optimisation with many false-positive. Worth checking but don't block CI
 	"TRY003", # raise-vanilla-args, avoid multitude of exception classes
 	"TRY301", # raise-within-try, it's handy
 	"UP015", # redundant-open-modes, explicit is preferred
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 3f7fc17a88..2eb9a5b2fc 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2187,7 +2187,7 @@ def get_args(cls, dist, header=None):
         spec = str(dist.as_requirement())
         for type_ in 'console', 'gui':
             group = type_ + '_scripts'
-            for name, ep in dist.get_entry_map(group).items():
+            for name in dist.get_entry_map(group).keys():
                 cls._ensure_safe_name(name)
                 script_text = cls.template % locals()
                 args = cls._get_script_args(type_, name, header, script_text)
diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index ae5572b83c..444c7a3689 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -485,14 +485,8 @@ def test_process_template_line_invalid(self):
             'prune',
             'blarg',
         ):
-            try:
+            with pytest.raises(DistutilsTemplateError):
                 file_list.process_template_line(action)
-            except DistutilsTemplateError:
-                pass
-            except Exception:
-                assert False, "Incorrect error thrown"
-            else:
-                assert False, "Should have thrown an error"
 
     def test_include(self, caplog):
         caplog.set_level(logging.DEBUG)