@@ -1517,11 +1517,11 @@ def testGetaddrinfo(self):
15171517 infos = socket .getaddrinfo (HOST , 80 , socket .AF_INET , socket .SOCK_STREAM )
15181518 for family , type , _ , _ , _ in infos :
15191519 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 ) )
15221522 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 ) )
15251525 infos = socket .getaddrinfo (HOST , None , 0 , socket .SOCK_STREAM )
15261526 for _ , socktype , _ , _ , _ in infos :
15271527 self .assertEqual (socktype , socket .SOCK_STREAM )
@@ -1795,10 +1795,10 @@ def test_str_for_enums(self):
17951795 # Make sure that the AF_* and SOCK_* constants have enum-like string
17961796 # reprs.
17971797 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 ) )
18021802
18031803 def test_socket_consistent_sock_type (self ):
18041804 SOCK_NONBLOCK = getattr (socket , 'SOCK_NONBLOCK' , 0 )
0 commit comments