Simplify code a bit

Signed-off-by: Bernát Gábor <[email protected]>

src/pyproject_fmt/formatter/project.py

@@ -2,6 +2,7 @@
 
 from typing import Optional, cast
 
+from tomlkit.container import OutOfOrderTableProxy
 from tomlkit.items import Array, String, Table
 from tomlkit.toml_document import TOMLDocument
 
@@ -15,6 +16,8 @@ def fmt_project(parsed: TOMLDocument, conf: Config) -> None:
  if project is None:
  return
 
+ key_order = ["name", "version", "description", "readme", "keywords", "license", "license-files"]
+ key_order.extend(["maintainers", "authors", "requires-python", "classifiers", "dynamic", "dependencies"])
  if "name" in project: # normalize names to underscore so sdist / wheel have the same prefix
  name = project["name"]
  assert isinstance(name, str)
@@ -49,30 +52,8 @@ def fmt_project(parsed: TOMLDocument, conf: Config) -> None:
  # order maintainers and authors table
  # update classifiers depending on requires
  # handle readme table
-
- order_keys(
- project,
- (
- "name",
- "version",
- "description",
- "readme",
- "keywords",
- "license",
- "license-files",
- "maintainers",
- "authors",
- "requires-python",
- "dependencies",
- "dynamic",
- "classifiers",
- "optional-dependencies",
- "urls",
- "scripts",
- "gui-scripts",
- "entry-points",
- ),
- )
+ key_order.extend(["optional-dependencies", "urls", "scripts", "gui-scripts", "entry-points"])
+ order_keys(project, key_order)
 
 
 __all__ = [

src/pyproject_fmt/formatter/util.py

@@ -4,6 +4,7 @@
 from dataclasses import dataclass, field
 from typing import Any, Callable, Sequence
 
+from tomlkit.container import OutOfOrderTableProxy
 from tomlkit.items import (
  AbstractTable,
  Array,
@@ -34,10 +35,12 @@ def __gt__(self, __other: Any) -> bool: # noqa: U101
 
 
 def order_keys(
- table: AbstractTable,
+ table: AbstractTable | OutOfOrderTableProxy,
  to_pin: Sequence[str] | None = None,
  sort_key: None | Callable[[tuple[str, tuple[Key, Item]]], SupportsDunderLT | SupportsDunderGT] = None,
 ) -> None:
+ if isinstance(table, OutOfOrderTableProxy):
+ return # pragma: no cover
  body = table.value.body
  entries = {i.key: (i, v) for (i, v) in body if isinstance(i, Key)}
  body.clear()

whitelist.txt

@@ -2,9 +2,16 @@ autoclass
 autodoc
 capsys
 chdir
+conf
+configs
+deps
+difflib
 dunder
 extlinks
+fmt
+formatter
 fromfile
+func
 intersphinx
 iread
 iwrite
@@ -15,10 +22,12 @@ pygments
 pyproject
 raws
 readouterr
+req
 sdist
 skipif
+tmp
 tofile
 toml
 tomlkit
-tomls
 typehints
+util