style: fix non-pep585-annotation (UP006)

Author: spaceone

httoop/authentication/__init__.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
+
 import re
-from typing import Any, Dict, List, Tuple
+from typing import Any
 
 from httoop.authentication.basic import BasicAuthRequestScheme, BasicAuthResponseScheme
 from httoop.authentication.digest import DigestAuthRequestScheme, DigestAuthResponseScheme
@@ -22,7 +23,7 @@ def sanitize(self) -> None:
                 self.params[key] = type(value)(x.encode('UTF-8') if not isinstance(x, bytes) and isinstance(x, str) else x for x in value)
 
     @classmethod
-    def parseparams(cls, elementstr: bytes) -> Tuple[bytes, Dict[bytes, str]] | Tuple[bytes, Dict[str, bytes]] | Tuple[bytes, Dict[str, bytes | List[bytes] | bool]] | Tuple[bytes, Dict[str, bytes | List[bytes]]] | Tuple[bytes, Dict[bytes, str | bytes]]:
+    def parseparams(cls, elementstr: bytes) -> tuple[bytes, dict[bytes, str]] | tuple[bytes, dict[str, bytes]] | tuple[bytes, dict[str, bytes | list[bytes] | bool]] | tuple[bytes, dict[str, bytes | list[bytes]]] | tuple[bytes, dict[bytes, str | bytes]]:
         try:
             scheme, authinfo = elementstr.split(b' ', 1)
         except ValueError:
@@ -53,7 +54,7 @@ def compose(self) -> bytes:
         return b'%s %s' % (self.value.encode('ASCII').title(), authinfo)
 
     @classmethod
-    def split(cls, value: bytes) -> List[bytes | Any]:
+    def split(cls, value: bytes) -> list[bytes | Any]:
         value = cls.RE_SPACE_SPLIT.split(value)
         indexes = [i for i, val in enumerate(value) if val != b',' and b'=' not in val]
         return [b' '.join(value[a:b]) for a, b in zip(indexes, indexes[1:] + [None])]
@@ -99,11 +100,11 @@ class AuthResponseElement(AuthElement):
     }
 
     @classmethod
-    def sorted(cls, elements: List[WWWAuthenticate | Any]) -> List[WWWAuthenticate | Any]:
+    def sorted(cls, elements: list[WWWAuthenticate | Any]) -> list[WWWAuthenticate | Any]:
         return list(sorted(elements, key=lambda e: {'basic': '\xff'}.get(e.value.lower(), e.value)))
 
     @classmethod
-    def join(cls, values: List[bytes]) -> bytes:
+    def join(cls, values: list[bytes]) -> bytes:
         return b' '.join(values)
 
     @property

httoop/authentication/basic.py

@@ -1,7 +1,7 @@
 
 from __future__ import annotations
+
 from binascii import Error as Base64Error
-from typing import Dict
 
 from httoop.exceptions import InvalidHeader
 from httoop.header.element import HeaderElement
@@ -11,7 +11,7 @@
 class BasicAuthRequestScheme:
 
     @staticmethod
-    def parse(authinfo: bytes) -> Dict[str, bytes]:
+    def parse(authinfo: bytes) -> dict[str, bytes]:
         # try:
         #    authinfo = authinfo.encode('ascii')
         # except ValueError:
@@ -44,7 +44,7 @@ def compose(authinfo: ByteUnicodeDict) -> bytes:
 class BasicAuthResponseScheme:
 
     @staticmethod
-    def parse(authinfo: bytes) -> Dict[bytes, str | bytes]:
+    def parse(authinfo: bytes) -> dict[bytes, str | bytes]:
         params = HeaderElement.parseparams(b'X;%s' % authinfo)[1]
         params.setdefault(b'realm', b'')
         return params

httoop/authentication/digest.py

@@ -1,7 +1,8 @@
 
 from __future__ import annotations
+
 from hashlib import md5, sha256
-from typing import Callable, Dict, List, Tuple
+from typing import Callable
 
 from httoop.exceptions import InvalidHeader
 from httoop.header.element import HeaderElement
@@ -56,7 +57,7 @@ def parse(cls, authinfo: bytes) -> ByteUnicodeDict:
 class DigestAuthResponseScheme(DigestAuthScheme):  # WWW-Authenticate
 
     @classmethod
-    def _compose(cls, authinfo: ByteUnicodeDict) -> List[Tuple[str, bytes]]:
+    def _compose(cls, authinfo: ByteUnicodeDict) -> list[tuple[str, bytes]]:
         realm = authinfo['realm']
         algorithm = authinfo.get('algorithm', b'MD5')
         domain = authinfo.get('domain')
@@ -85,7 +86,7 @@ def _compose(cls, authinfo: ByteUnicodeDict) -> List[Tuple[str, bytes]]:
         return [(k, v) for k, v in params if v is not None]
 
     @classmethod
-    def parse(cls, authinfo: bytes) -> Dict[str, bytes | List[bytes] | bool]:
+    def parse(cls, authinfo: bytes) -> dict[str, bytes | list[bytes] | bool]:
         params = super(cls, cls).parse(authinfo)
         if b'"' in params['nonce']:
             raise InvalidHeader(_('Nonce must not contain double quote'))
@@ -107,7 +108,7 @@ def parse(cls, authinfo: bytes) -> Dict[str, bytes | List[bytes] | bool]:
 class DigestAuthRequestScheme(DigestAuthScheme):  # Authorization
 
     @classmethod
-    def _compose(cls, authinfo: ByteUnicodeDict) -> List[Tuple[str, bytes]]:
+    def _compose(cls, authinfo: ByteUnicodeDict) -> list[tuple[str, bytes]]:
         username = authinfo['username']
         realm = authinfo['realm']
         digest_uri = authinfo['uri']
@@ -136,7 +137,7 @@ def _compose(cls, authinfo: ByteUnicodeDict) -> List[Tuple[str, bytes]]:
         return [(k, v) for k, v in params if v is not None]
 
     @classmethod
-    def parse(cls, authinfo: bytes) -> Dict[str, bytes]:
+    def parse(cls, authinfo: bytes) -> dict[str, bytes]:
         params = super(cls, cls).parse(authinfo)
         message_qop = params.get('qop')
         cnonce = None

httoop/codecs/__init__.py

@@ -5,7 +5,7 @@
 from __future__ import annotations
 
 import inspect
-from typing import Any, Type
+from typing import Any
 
 from httoop.codecs import application, audio, example, image, message, model, multipart, text, video
 from httoop.codecs.codec import Codec
@@ -26,7 +26,7 @@ def lookup(encoding: str, raise_errors: bool = True) -> Any:
     return CODECS.get(encoding) or CODECS.get(type_) or (raise_errors and CODECS[encoding]) or None
 
 
-def register(encoding: str, codec: Type[Codec]) -> None:
+def register(encoding: str, codec: type[Codec]) -> None:
     CODECS[encoding] = codec
 
 

httoop/codecs/application/hal_json.py

@@ -2,14 +2,14 @@
 
 from __future__ import annotations
 
-from typing import Any, Dict, Iterator, List, Optional
+from typing import Any, Iterator
 
 
 try:
     from uritemplate import expand
 except ImportError:
     # TODO: emit a warning
-    def expand(href: str, templates: Dict[str, str]) -> str:
+    def expand(href: str, templates: dict[str, str]) -> str:
         for templ, value in templates.items():
             href = href.replace('{%s}' % (templ, ), value)
         return href
@@ -36,7 +36,7 @@ def __init__(self, *args, **kwargs) -> None:
     def self(self) -> str:
         return self.expand(self.get_link('self')['href'])
 
-    def get_links(self, relation: str, name: None = None) -> Iterator[Dict[str, None | bool | str]]:
+    def get_links(self, relation: str, name: None = None) -> Iterator[dict[str, None | bool | str]]:
         links = self['_links'].get(relation)
         if links is None:
             return
@@ -66,13 +66,13 @@ def get_links(self, relation: str, name: None = None) -> Iterator[Dict[str, None
                 link['deprecation'] = False
             yield link
 
-    def get_link(self, relation: str, name: str | None = None) -> Dict[str, bool | str | None] | None:
+    def get_link(self, relation: str, name: str | None = None) -> dict[str, bool | str | None] | None:
         try:
             return next(self.get_links(relation, name))
         except StopIteration:
             pass
 
-    def get_relations(self) -> List[str]:
+    def get_relations(self) -> list[str]:
         return list(set(self['_links'].keys()) | set(self['_embedded'].keys()))
 
     def get_resources(self, relation: str) -> None:
@@ -103,15 +103,15 @@ def get_curie(self, relation: str) -> str:
                 return self.expand(link['href'], rel=rel)
         return relation
 
-    def add_link(self, relation: str, link: Dict[str, str]) -> None:
+    def add_link(self, relation: str, link: dict[str, str]) -> None:
         links = self['_links'].setdefault(relation, [])
         if not isinstance(links, list):
             links = [links]
         links.append(link)
         self['_links'][relation] = links
         self['_links'][relation] = list(self.get_links(relation))
 
-    def add_resource(self, relation: str, resource: Dict[Any, Any]) -> None:
+    def add_resource(self, relation: str, resource: dict[Any, Any]) -> None:
         resources = list(self.get_resources(relation))
         resources.append(resource)
         self['_embedded'][relation] = resources
@@ -128,7 +128,7 @@ def decode(cls, data: bytes, charset: str | None = None, mimetype: ContentType |
         return Resource(data)
 
     @classmethod
-    def encode(cls, data: Dict[str, None] | Resource, charset: str | None = None, mimetype: ContentType | None = None) -> bytes:
+    def encode(cls, data: dict[str, None] | Resource, charset: str | None = None, mimetype: ContentType | None = None) -> bytes:
         if not isinstance(data, dict):
             raise EncodeError('HAL documents must be JSON objects.')
 

httoop/codecs/application/json.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from json import dumps as json_encode, loads as json_decode
-from typing import Any, Dict, Optional
+from typing import Any
 
 from httoop.codecs.codec import Codec
 
@@ -10,12 +10,12 @@ class JSON(Codec):
     mimetype = 'application/json'
 
     @classmethod
-    def encode(cls, data: Dict[str, str] | Resource, charset: str | None = None, mimetype: ContentType | None = None) -> bytes:
+    def encode(cls, data: dict[str, str] | Resource, charset: str | None = None, mimetype: ContentType | None = None) -> bytes:
         data = json_encode(data)
         if not isinstance(data, bytes):  # python3
             data = data.encode(charset or 'UTF-8')
         return data
 
     @classmethod
-    def decode(cls, data: bytes, charset: str | None = None, mimetype: ContentType | None = None) -> Dict[str, Any]:
+    def decode(cls, data: bytes, charset: str | None = None, mimetype: ContentType | None = None) -> dict[str, Any]:
         return json_decode(data.decode(charset or 'ASCII'))

httoop/codecs/application/x_www_form_urlencoded.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
-from typing import Any, List, Optional, Tuple, Union
+
+from typing import Any
 
 from httoop.codecs.codec import Codec
 from httoop.uri.percent_encoding import Percent
@@ -14,7 +15,7 @@ class FormURLEncoded(Codec):
     UNQUOTED = Percent.UNRESERVED
 
     @classmethod
-    def decode(cls, data: bytes, charset: str | None = None, mimetype: ContentType | None = None) -> Tuple[Tuple[str, str], Tuple[str, str]] | Tuple[Tuple[str, str]] | Tuple[Tuple[str, str], Tuple[str, str], Tuple[str, str]] | Tuple[Tuple[str, str], Tuple[str, str], Tuple[str, str], Tuple[str, str]] | Tuple[()]:
+    def decode(cls, data: bytes, charset: str | None = None, mimetype: ContentType | None = None) -> tuple[tuple[str, str], tuple[str, str]] | tuple[tuple[str, str]] | tuple[tuple[str, str], tuple[str, str], tuple[str, str]] | tuple[tuple[str, str], tuple[str, str], tuple[str, str], tuple[str, str]] | tuple[()]:
         if not data:
             return ()
         data = data.replace(b'+', b' ').strip(b'&').split(b'&')
@@ -36,6 +37,6 @@ def unquote(cls, data: bytes, charset: str | None = None) -> str:
         return Percent.unquote(data).decode(charset or 'ISO8859-1')
 
     @classmethod
-    def quote(cls, data: str | List[int], charset: str | None = None) -> bytes:
+    def quote(cls, data: str | list[int], charset: str | None = None) -> bytes:
         data = data.encode(charset or 'ISO8859-1')
         return Percent.quote(data, cls.UNQUOTED)

httoop/codecs/application/xml.py

@@ -19,7 +19,6 @@ def fromstring(data):
         raise ParseError('Will not parse without defusedxml!')
 
 
-from typing import Optional
 
 from httoop.codecs.codec import Codec
 from httoop.exceptions import DecodeError

httoop/codecs/application/zlib.py

@@ -2,7 +2,6 @@
 from __future__ import annotations
 
 import zlib
-from typing import Optional
 
 from httoop.codecs.codec import Codec
 from httoop.exceptions import DecodeError, EncodeError

httoop/codecs/message/http.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Optional
-
 from httoop.codecs.codec import Codec