refactor: remove RET505 and add spaces

Author: henryiii

pyproject.toml

@@ -139,6 +139,6 @@ ignore = [
 flake8-unused-arguments.ignore-variadic-names = true
 
 [tool.ruff.lint.per-file-ignores]
-"tests/test_*.py" = ["PYI024", "PLR", "SIM201"]
+"tests/test_*.py" = ["PYI024", "PLR", "SIM201", "RET505"]
 "tasks/check.py" = ["UP032"]
 "tests/test_requirements.py" = ["UP032"]

src/packaging/_parser.py

@@ -316,14 +316,17 @@ def _parse_marker_var(tokenizer: Tokenizer) -> MarkerVar:  # noqa: RET503
     """
     if tokenizer.check("VARIABLE"):
         return process_env_var(tokenizer.read().text.replace(".", "_"))
+
     if tokenizer.check("QUOTED_STRING"):
         return process_python_str(tokenizer.read().text)
+
     tokenizer.raise_syntax_error(message="Expected a marker variable or quoted string")
 
 
 def process_env_var(env_var: str) -> Variable:
     if env_var in ("platform_python_implementation", "python_implementation"):
         return Variable("platform_python_implementation")
+
     return Variable(env_var)
 
 
@@ -339,13 +342,16 @@ def _parse_marker_op(tokenizer: Tokenizer) -> Op:
     if tokenizer.check("IN"):
         tokenizer.read()
         return Op("in")
+
     if tokenizer.check("NOT"):
         tokenizer.read()
         tokenizer.expect("WS", expected="whitespace after 'not'")
         tokenizer.expect("IN", expected="'in' after 'not'")
         return Op("not in")
+
     if tokenizer.check("OP"):
         return Op(tokenizer.read().text)
+
     return tokenizer.raise_syntax_error(
         "Expected marker operator, one of <=, <, !=, ==, >=, >, ~=, ===, in, not in"
     )

src/packaging/markers.py

@@ -157,9 +157,12 @@ def _format_marker(
         inner = (_format_marker(m, first=False) for m in marker)
         if first:
             return " ".join(inner)
+
         return "(" + " ".join(inner) + ")"
+
     if isinstance(marker, tuple):
         return " ".join([m.serialize() for m in marker])
+
     return marker
 
 
@@ -201,6 +204,7 @@ def _normalize(
     if key == "extra":
         assert isinstance(rhs, str), "extra value must be a string"
         return (canonicalize_name(lhs), canonicalize_name(rhs))
+
     if key in MARKERS_ALLOWING_SET:
         return (
             canonicalize_name(lhs),

src/packaging/metadata.py

@@ -657,10 +657,12 @@ def _process_dynamic(self, value: list[str]) -> list[str]:
                 raise self._invalid_metadata(
                     f"{dynamic_field!r} is not allowed as a dynamic field"
                 )
+
             if dynamic_field not in _EMAIL_TO_RAW_MAPPING:
                 raise self._invalid_metadata(
                     f"{dynamic_field!r} is not a valid dynamic field"
                 )
+
         return list(map(str.lower, value))
 
     def _process_provides_extra(
@@ -745,16 +747,19 @@ def _process_import_names(self, value: list[str]) -> list[str]:
                         f"{name!r} is invalid for {{field}}; "
                         f"{identifier!r} is not a valid identifier"
                     )
+
                 if keyword.iskeyword(identifier):
                     raise self._invalid_metadata(
                         f"{name!r} is invalid for {{field}}; "
                         f"{identifier!r} is a keyword"
                     )
+
             if semicolon and private.lstrip() != "private":
                 raise self._invalid_metadata(
                     f"{import_name!r} is invalid for {{field}}; "
                     "the only valid option is 'private'"
                 )
+
         return value
 
     _process_import_namespaces = _process_import_names

src/packaging/tags.py

@@ -263,10 +263,12 @@ def _generic_abi() -> list[str]:
     ext_suffix = _get_config_var("EXT_SUFFIX", warn=True)
     if not isinstance(ext_suffix, str) or ext_suffix[0] != ".":
         raise SystemError("invalid sysconfig.get_config_var('EXT_SUFFIX')")
+
     parts = ext_suffix.split(".")
     if len(parts) < 3:
         # CPython3.7 and earlier uses ".pyd" on Windows.
         return _cpython_abis(sys.version_info[:2])
+
     soabi = parts[1]
     if soabi.startswith("cpython"):
         # non-windows
@@ -283,6 +285,7 @@ def _generic_abi() -> list[str]:
         abi = soabi
     else:
         return []
+
     return [_normalize_string(abi)]
 
 
@@ -572,6 +575,7 @@ def _linux_platforms(is_32bit: bool = _32_BIT_INTERPRETER) -> Iterator[str]:
         # we should never be here, just yield the sysconfig one and return
         yield linux
         return
+
     if is_32bit:
         if linux == "linux_x86_64":
             linux = "linux_i686"
@@ -595,12 +599,16 @@ def platform_tags() -> Iterator[str]:
     """
     if platform.system() == "Darwin":
         return mac_platforms()
+
     if platform.system() == "iOS":
         return ios_platforms()
+
     if platform.system() == "Android":
         return android_platforms()
+
     if platform.system() == "Linux":
         return _linux_platforms()
+
     return _generic_platforms()
 
 

src/packaging/version.py

@@ -333,6 +333,7 @@ def local(self) -> str | None:
         """
         if self._version.local:
             return ".".join(str(x) for x in self._version.local)
+
         return None
 
     @property