style: add additional lint groups (ICN, ISC, N, RET, RSE)

Author: danieleades

copier/errors.py

@@ -72,7 +72,7 @@ class ExtensionNotFoundError(UserMessageError):
     """Extensions listed in the configuration could not be loaded."""
 
 
-class CopierAnswersInterrupt(CopierError, KeyboardInterrupt):
+class CopierAnswersInterruptError(CopierError, KeyboardInterrupt):
     """CopierAnswersInterrupt is raised during interactive question prompts.
 
     It typically follows a KeyboardInterrupt (i.e. ctrl-c) and provides an

copier/jinja_ext.py

@@ -60,7 +60,7 @@ class YieldExtension(Extension):
         ```
     """  # noqa: E501
 
-    tags = {"yield"}
+    tags = {"yield"}  # noqa: RUF012
 
     environment: YieldEnvironment
 

copier/main.py

@@ -39,7 +39,7 @@
 from questionary import unsafe_prompt
 
 from .errors import (
-    CopierAnswersInterrupt,
+    CopierAnswersInterruptError,
     ExtensionNotFoundError,
     UnsafeTemplateError,
     UserMessageError,
@@ -561,7 +561,7 @@ def _ask(self) -> None:  # noqa: C901
                         answers={question.var_name: question.get_default()},
                     )[question.var_name]
             except KeyboardInterrupt as err:
-                raise CopierAnswersInterrupt(
+                raise CopierAnswersInterruptError(
                     self.answers, question, self.template
                 ) from err
             self.answers.user[var_name] = new_answer

copier/settings.py

@@ -39,7 +39,7 @@ def from_file(cls, settings_path: Path | None = None) -> Settings:
         if settings_path.is_file():
             data = yaml.safe_load(settings_path.read_text())
             return cls.model_validate(data)
-        elif env_path:
+        if env_path:
             warnings.warn(
                 f"Settings file not found at {env_path}", MissingSettingsWarning
             )

copier/template.py

@@ -260,7 +260,7 @@ def _raw_config(self) -> AnyByStrDict:
         ]
         if len(conf_paths) > 1:
             raise MultipleConfigFilesError(conf_paths)
-        elif len(conf_paths) == 1:
+        if len(conf_paths) == 1:
             return load_template_config(conf_paths[0])
         return {}
 

copier/tools.py

@@ -131,7 +131,7 @@ def cast_to_bool(value: Any) -> bool:
         lower = value.lower()
         if lower in {"y", "yes", "t", "true", "on"}:
             return True
-        elif lower in {"n", "no", "f", "false", "off", "~", "null", "none"}:
+        if lower in {"n", "no", "f", "false", "off", "~", "null", "none"}:
             return False
     # Assume nothing
     return bool(value)

copier/user_data.py

@@ -263,8 +263,7 @@ def get_default(self) -> Any:
                     result = self.render_value(
                         self.settings.defaults.get(self.var_name, self.default)
                     )
-        result = self.cast_answer(result)
-        return result
+        return self.cast_answer(result)
 
     def get_default_rendered(self) -> bool | str | Choice | None | MissingType:
         """Get default answer rendered for the questionary lib.

pyproject.toml

@@ -118,10 +118,15 @@ extend-select = [
   "FLY",
   "FURB",
   "I",
+  "ICN",
+  "ISC",
+  "N",
   "PERF",
   "PIE",
   "PGH",
   "PTH",
+  "RET",
+  "RSE",
   "RUF",
   "SIM",
   "UP",

tests/conftest.py

@@ -89,5 +89,4 @@ def config_path(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> Iterator[Pat
 @pytest.fixture
 def settings_path(config_path: Path) -> Path:
     config_path.mkdir()
-    settings_path = config_path / "settings.yml"
-    return settings_path
+    return config_path / "settings.yml"

tests/test_interrupts.py

@@ -3,7 +3,7 @@
 import pytest
 
 from copier import Worker
-from copier.errors import CopierAnswersInterrupt
+from copier.errors import CopierAnswersInterruptError
 
 from .helpers import build_file_tree
 
@@ -14,7 +14,7 @@
         # We override the prompt method from questionary to raise this
         # exception and expect our surrounding machinery to re-raise
         # it as a CopierAnswersInterrupt.
-        CopierAnswersInterrupt(Mock(), Mock(), Mock()),
+        CopierAnswersInterruptError(Mock(), Mock(), Mock()),
         KeyboardInterrupt,
     ],
 )
@@ -66,7 +66,7 @@ def test_multiple_questions_interrupt(tmp_path_factory: pytest.TempPathFactory)
             KeyboardInterrupt,
         ],
     ):
-        with pytest.raises(CopierAnswersInterrupt) as err:
+        with pytest.raises(CopierAnswersInterruptError) as err:
             worker.run_copy()
         assert err.value.answers.user == {
             "question1": "foobar",