33import socket
44import sys
55from socket import AddressFamily , SocketKind
6- from typing import TYPE_CHECKING
6+ from typing import TYPE_CHECKING , Literal
77
88import attrs
99import pytest
2020if TYPE_CHECKING :
2121 from collections .abc import Sequence
2222
23+ from trio ._socket import _GetAddrInfoEntry
2324 from trio .testing import MockClock
2425
2526if sys .version_info < (3 , 11 ):
@@ -60,7 +61,7 @@ def close(self) -> None:
6061def test_reorder_for_rfc_6555_section_5_4 () -> None :
6162 def fake4 (
6263 i : int ,
63- ) -> tuple [ socket . AddressFamily , socket . SocketKind , int , str , tuple [ str , int ]] :
64+ ) -> _GetAddrInfoEntry :
6465 return (
6566 AF_INET ,
6667 SOCK_STREAM ,
@@ -71,8 +72,14 @@ def fake4(
7172
7273 def fake6 (
7374 i : int ,
74- ) -> tuple [socket .AddressFamily , socket .SocketKind , int , str , tuple [str , int ]]:
75- return (AF_INET6 , SOCK_STREAM , IPPROTO_TCP , "" , (f"::{ i } " , 80 ))
75+ ) -> tuple [
76+ Literal [AddressFamily .AF_INET6 ],
77+ SocketKind ,
78+ int ,
79+ str ,
80+ tuple [str , int , int , int ] | tuple [int , bytes ],
81+ ]:
82+ return (AF_INET6 , SOCK_STREAM , IPPROTO_TCP , "" , (f"::{ i } " , 80 , 0 , 0 ))
7683
7784 for fake in fake4 , fake6 :
7885 # No effect on homogeneous lists
@@ -281,21 +288,17 @@ def socket(
281288 self .socket_count += 1
282289 return FakeSocket (self , family , type_ , proto )
283290
284- def _ip_to_gai_entry (self , ip : str ) -> tuple [
285- AddressFamily ,
286- SocketKind ,
287- int ,
288- str ,
289- tuple [str , int , int , int ] | tuple [str , int ] | tuple [int , bytes ],
290- ]:
291- sockaddr : tuple [str , int ] | tuple [str , int , int , int ] | tuple [int , bytes ]
291+ def _ip_to_gai_entry (self , ip : str ) -> _GetAddrInfoEntry :
292292 if ":" in ip :
293- family = trio .socket .AF_INET6
294- sockaddr = (ip , self .port , 0 , 0 )
293+ return (
294+ trio .socket .AF_INET6 ,
295+ SOCK_STREAM ,
296+ IPPROTO_TCP ,
297+ "" ,
298+ (ip , self .port , 0 , 0 ),
299+ )
295300 else :
296- family = trio .socket .AF_INET
297- sockaddr = (ip , self .port )
298- return (family , SOCK_STREAM , IPPROTO_TCP , "" , sockaddr )
301+ return (trio .socket .AF_INET , SOCK_STREAM , IPPROTO_TCP , "" , (ip , self .port ))
299302
300303 async def getaddrinfo (
301304 self ,
@@ -305,15 +308,7 @@ async def getaddrinfo(
305308 type : int = - 1 ,
306309 proto : int = - 1 ,
307310 flags : int = - 1 ,
308- ) -> list [
309- tuple [
310- AddressFamily ,
311- SocketKind ,
312- int ,
313- str ,
314- tuple [str , int , int , int ] | tuple [str , int ] | tuple [int , bytes ],
315- ]
316- ]:
311+ ) -> list [_GetAddrInfoEntry ]:
317312 assert host == b"test.example.com"
318313 assert port == self .port
319314 assert family == trio .socket .AF_UNSPEC
0 commit comments