22import re
33import sys
44import warnings
5- from collections .abc import Mapping , Sequence
5+ from collections .abc import Iterable , Mapping , Sequence
66from contextlib import suppress
77from functools import _CacheInfo , lru_cache
88from ipaddress import ip_address
99from typing import (
1010 TYPE_CHECKING ,
1111 Any ,
12- Iterable ,
13- List ,
1412 SupportsInt ,
1513 Tuple ,
1614 TypedDict ,
@@ -109,34 +107,34 @@ class _InternalURLCache(TypedDict, total=False):
109107 explicit_port : Union [int , None ]
110108 raw_path : str
111109 path : str
112- _parsed_query : List [ Tuple [str , str ]]
110+ _parsed_query : list [ tuple [str , str ]]
113111 query : "MultiDictProxy[str]"
114112 raw_query_string : str
115113 query_string : str
116114 path_qs : str
117115 raw_path_qs : str
118116 raw_fragment : str
119117 fragment : str
120- raw_parts : Tuple [str , ...]
121- parts : Tuple [str , ...]
118+ raw_parts : tuple [str , ...]
119+ parts : tuple [str , ...]
122120 parent : "URL"
123121 raw_name : str
124122 name : str
125123 raw_suffix : str
126124 suffix : str
127- raw_suffixes : Tuple [str , ...]
128- suffixes : Tuple [str , ...]
125+ raw_suffixes : tuple [str , ...]
126+ suffixes : tuple [str , ...]
129127
130128
131129def rewrite_module (obj : _T ) -> _T :
132130 obj .__module__ = "yarl"
133131 return obj
134132
135133
136- def _normalize_path_segments (segments : "Sequence[str]" ) -> List [str ]:
134+ def _normalize_path_segments (segments : "Sequence[str]" ) -> list [str ]:
137135 """Drop '.' and '..' from a sequence of str segments"""
138136
139- resolved_path : List [str ] = []
137+ resolved_path : list [str ] = []
140138
141139 for seg in segments :
142140 if seg == ".." :
@@ -504,7 +502,7 @@ def __bool__(self) -> bool:
504502 val = self ._val
505503 return bool (val .netloc or val .path or val .query or val .fragment )
506504
507- def __getstate__ (self ) -> Tuple [SplitResult ]:
505+ def __getstate__ (self ) -> tuple [SplitResult ]:
508506 return (self ._val ,)
509507
510508 def __setstate__ (self , state ):
@@ -786,7 +784,7 @@ def path_safe(self) -> str:
786784 return self ._PATH_SAFE_UNQUOTER (self .raw_path )
787785
788786 @cached_property
789- def _parsed_query (self ) -> List [ Tuple [str , str ]]:
787+ def _parsed_query (self ) -> list [ tuple [str , str ]]:
790788 """Parse query part of URL."""
791789 return parse_qsl (self ._val .query , keep_blank_values = True )
792790
@@ -851,7 +849,7 @@ def fragment(self) -> str:
851849 return self ._UNQUOTER (self ._val .fragment )
852850
853851 @cached_property
854- def raw_parts (self ) -> Tuple [str , ...]:
852+ def raw_parts (self ) -> tuple [str , ...]:
855853 """A tuple containing encoded *path* parts.
856854
857855 ('/',) for absolute URLs if *path* is missing.
@@ -865,7 +863,7 @@ def raw_parts(self) -> Tuple[str, ...]:
865863 return tuple (path .split ("/" ))
866864
867865 @cached_property
868- def parts (self ) -> Tuple [str , ...]:
866+ def parts (self ) -> tuple [str , ...]:
869867 """A tuple containing decoded *path* parts.
870868
871869 ('/',) for absolute URLs if *path* is missing.
@@ -920,15 +918,15 @@ def suffix(self) -> str:
920918 return self ._UNQUOTER (self .raw_suffix )
921919
922920 @cached_property
923- def raw_suffixes (self ) -> Tuple [str , ...]:
921+ def raw_suffixes (self ) -> tuple [str , ...]:
924922 name = self .raw_name
925923 if name .endswith ("." ):
926924 return ()
927925 name = name .lstrip ("." )
928926 return tuple ("." + suffix for suffix in name .split ("." )[1 :])
929927
930928 @cached_property
931- def suffixes (self ) -> Tuple [str , ...]:
929+ def suffixes (self ) -> tuple [str , ...]:
932930 return tuple (self ._UNQUOTER (suffix ) for suffix in self .raw_suffixes )
933931
934932 @staticmethod
@@ -947,7 +945,7 @@ def _make_child(self, paths: "Sequence[str]", encoded: bool = False) -> "URL":
947945 add paths to self._val.path, accounting for absolute vs relative paths,
948946 keep existing, but do not create new, empty segments
949947 """
950- parsed : List [str ] = []
948+ parsed : list [str ] = []
951949 needs_normalize : bool = False
952950 for idx , path in enumerate (reversed (paths )):
953951 # empty segment of last is not removed
@@ -995,7 +993,7 @@ def _normalize_path(cls, path: str) -> str:
995993 @lru_cache # match the same size as urlsplit
996994 def _parse_host (
997995 cls , host : str
998- ) -> Tuple [bool , str , Union [bool , None ], str , str , str ]:
996+ ) -> tuple [bool , str , Union [bool , None ], str , str , str ]:
999997 """Parse host into parts
1000998
1001999 Returns a tuple of:
@@ -1111,7 +1109,7 @@ def _make_netloc(
11111109 def _split_netloc (
11121110 cls ,
11131111 netloc : str ,
1114- ) -> Tuple [Union [str , None ], Union [str , None ], Union [str , None ], Union [int , None ]]:
1112+ ) -> tuple [Union [str , None ], Union [str , None ], Union [str , None ], Union [int , None ]]:
11151113 """Split netloc into username, password, host and port."""
11161114 if "@" not in netloc :
11171115 username : Union [str , None ] = None
@@ -1253,7 +1251,7 @@ def with_path(self, path: str, *, encoded: bool = False) -> "URL":
12531251
12541252 def _get_str_query_from_sequence_iterable (
12551253 self ,
1256- items : Iterable [Tuple [Union [str , istr ], QueryVariable ]],
1254+ items : Iterable [tuple [Union [str , istr ], QueryVariable ]],
12571255 ) -> str :
12581256 """Return a query string from a sequence of (key, value) pairs.
12591257
@@ -1299,7 +1297,7 @@ def _query_var(v: QueryVariable) -> str:
12991297 )
13001298
13011299 def _get_str_query_from_iterable (
1302- self , items : Iterable [Tuple [Union [str , istr ], str ]]
1300+ self , items : Iterable [tuple [Union [str , istr ], str ]]
13031301 ) -> str :
13041302 """Return a query string from an iterable.
13051303
@@ -1622,7 +1620,7 @@ def _idna_encode(host: str) -> str:
16221620
16231621
16241622@lru_cache (_MAXCACHE )
1625- def _ip_compressed_version (raw_ip : str ) -> Tuple [str , int ]:
1623+ def _ip_compressed_version (raw_ip : str ) -> tuple [str , int ]:
16261624 """Return compressed version of IP address and its version."""
16271625 ip = ip_address (raw_ip )
16281626 return ip .compressed , ip .version
0 commit comments