@@ -1517,11 +1517,11 @@ def testGetaddrinfo(self):
1517
1517
infos = socket .getaddrinfo (HOST , 80 , socket .AF_INET , socket .SOCK_STREAM )
1518
1518
for family , type , _ , _ , _ in infos :
1519
1519
self .assertEqual (family , socket .AF_INET )
1520
- self .assertEqual (repr (family ), '<AddressFamily.AF_INET: 2>' )
1521
- self .assertEqual (str (family ), '2' )
1520
+ self .assertEqual (repr (family ), '<AddressFamily.AF_INET: %r>' % family . value )
1521
+ self .assertEqual (str (family ), str ( family . value ) )
1522
1522
self .assertEqual (type , socket .SOCK_STREAM )
1523
- self .assertEqual (repr (type ), '<SocketKind.SOCK_STREAM: 1>' )
1524
- self .assertEqual (str (type ), '1' )
1523
+ self .assertEqual (repr (type ), '<SocketKind.SOCK_STREAM: %r>' % type . value )
1524
+ self .assertEqual (str (type ), str ( type . value ) )
1525
1525
infos = socket .getaddrinfo (HOST , None , 0 , socket .SOCK_STREAM )
1526
1526
for _ , socktype , _ , _ , _ in infos :
1527
1527
self .assertEqual (socktype , socket .SOCK_STREAM )
@@ -1795,10 +1795,10 @@ def test_str_for_enums(self):
1795
1795
# Make sure that the AF_* and SOCK_* constants have enum-like string
1796
1796
# reprs.
1797
1797
with socket .socket (socket .AF_INET , socket .SOCK_STREAM ) as s :
1798
- self .assertEqual (repr (s .family ), '<AddressFamily.AF_INET: 2>' )
1799
- self .assertEqual (repr (s .type ), '<SocketKind.SOCK_STREAM: 1>' )
1800
- self .assertEqual (str (s .family ), '2' )
1801
- self .assertEqual (str (s .type ), '1' )
1798
+ self .assertEqual (repr (s .family ), '<AddressFamily.AF_INET: %r>' % s . family . value )
1799
+ self .assertEqual (repr (s .type ), '<SocketKind.SOCK_STREAM: %r>' % s . type . value )
1800
+ self .assertEqual (str (s .family ), str ( s . family . value ) )
1801
+ self .assertEqual (str (s .type ), str ( s . type . value ) )
1802
1802
1803
1803
def test_socket_consistent_sock_type (self ):
1804
1804
SOCK_NONBLOCK = getattr (socket , 'SOCK_NONBLOCK' , 0 )
0 commit comments