First pre-commit swipe (isort, flake8-bugbear, black, pyupgrade)

.pre-commit-config.yaml

@@ -44,11 +44,11 @@ repos:
       - id: pyupgrade
         args: [--py36-plus]
 
-  - repo: https://github.com/hadialqattan/pycln
-    rev: v2.0.1
-    hooks:
-      - id: pycln
-        args: [--all]
+#  - repo: https://github.com/hadialqattan/pycln
+#    rev: v2.0.1
+#    hooks:
+#      - id: pycln
+#        args: [--all]
 
   - repo: https://github.com/pycqa/flake8
     rev: 4.0.1

tests/conftest.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 
 import pytest

tests/test_api.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import io
 import json
 import os

tests/test_build.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import datetime
 
 from tomlkit import aot

tests/test_items.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import math
 import pickle
 
@@ -120,7 +122,7 @@ def test_aot_unwrap():
     d = item([{"a": "A"}, {"b": "B"}])
     unwrapped = d.unwrap()
     assert_is_ppo(unwrapped, list)
-    for du, dw in zip(unwrapped, d):
+    for du, _dw in zip(unwrapped, d):
         assert_is_ppo(du, dict)
         for ku in du:
             vu = du[ku]

tests/test_parser.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 from tomlkit.exceptions import EmptyTableNameError

tests/test_toml_document.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import copy
 import json
 import pickle

tests/test_toml_file.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 
 from tomlkit.toml_document import TOMLDocument

tests/test_toml_spec_tests.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 import os
 import re

tests/test_toml_tests.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 
 import pytest

tests/test_utils.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from datetime import date
 from datetime import datetime as dt
 from datetime import time

tests/test_write.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from tomlkit import dumps
 from tomlkit import loads
 

tests/util.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from tomlkit.items import AoT
 from tomlkit.items import Array
 from tomlkit.items import Bool
@@ -43,7 +45,7 @@
 
 
 def assert_not_tomlkit_type(v):
-    for i, T in enumerate(TOMLKIT_TYPES):
+    for _, T in enumerate(TOMLKIT_TYPES):
         assert not isinstance(v, T)
 
 

tomlkit/_compat.py

@@ -1,14 +1,14 @@
+from __future__ import annotations
+
 import sys
 
 from typing import Any
-from typing import List
-from typing import Optional
 
 
 PY38 = sys.version_info >= (3, 8)
 
 
-def decode(string: Any, encodings: Optional[List[str]] = None):
+def decode(string: Any, encodings: list[str] | None = None):
     if not isinstance(string, bytes):
         return string
 

tomlkit/_utils.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import re
 
 from collections.abc import Mapping
@@ -7,7 +9,6 @@
 from datetime import timedelta
 from datetime import timezone
 from typing import Collection
-from typing import Union
 
 from ._compat import decode
 
@@ -41,7 +42,7 @@
 _utc = timezone(timedelta(), "UTC")
 
 
-def parse_rfc3339(string: str) -> Union[datetime, date, time]:
+def parse_rfc3339(string: str) -> datetime | date | time:
     m = RFC_3339_DATETIME.match(string)
     if m:
         year = int(m.group(1))
@@ -125,7 +126,6 @@ def escape_string(s: str, escape_sequences: Collection[str] = _basic_escapes) ->
 
     res = []
     start = 0
-    l = len(s)
 
     def flush(inc=1):
         if start != i:
@@ -134,7 +134,7 @@ def flush(inc=1):
         return i + inc
 
     i = 0
-    while i < l:
+    while i < len(s):
         for seq in escape_sequences:
             seq_len = len(seq)
             if s[i:].startswith(seq):

tomlkit/api.py

@@ -1,10 +1,10 @@
+from __future__ import annotations
+
 import datetime as _datetime
 
 from collections.abc import Mapping
 from typing import IO
 from typing import Iterable
-from typing import Tuple
-from typing import Union
 
 from ._utils import parse_rfc3339
 from .container import Container
@@ -33,7 +33,7 @@
 from .toml_document import TOMLDocument
 
 
-def loads(string: Union[str, bytes]) -> TOMLDocument:
+def loads(string: str | bytes) -> TOMLDocument:
     """
     Parses a string into a TOMLDocument.
 
@@ -75,7 +75,7 @@ def dump(data: Mapping, fp: IO[str], *, sort_keys: bool = False) -> None:
     fp.write(dumps(data, sort_keys=sort_keys))
 
 
-def parse(string: Union[str, bytes]) -> TOMLDocument:
+def parse(string: str | bytes) -> TOMLDocument:
     """
     Parses a string or bytes into a TOMLDocument.
     """
@@ -90,12 +90,12 @@ def document() -> TOMLDocument:
 
 
 # Items
-def integer(raw: Union[str, int]) -> Integer:
+def integer(raw: str | int) -> Integer:
     """Create an integer item from a number or string."""
     return item(int(raw))
 
 
-def float_(raw: Union[str, float]) -> Float:
+def float_(raw: str | float) -> Float:
     """Create an float item from a number or string."""
     return item(float(raw))
 
@@ -223,7 +223,7 @@ def aot() -> AoT:
     return AoT([])
 
 
-def key(k: Union[str, Iterable[str]]) -> Key:
+def key(k: str | Iterable[str]) -> Key:
     """Create a key from a string. When a list of string is given,
     it will create a dotted key.
 
@@ -260,7 +260,7 @@ def value(raw: str) -> _Item:
     return v
 
 
-def key_value(src: str) -> Tuple[Key, _Item]:
+def key_value(src: str) -> tuple[Key, _Item]:
     """Parse a key-value pair from a string.
 
     :Example: