Issue20386: SocketType is again socket.socket; the IntEnum SOCK constants are SocketKind

diff --cc Doc/library/socket.rst
Simple merge

diff --cc Lib/socket.py
index ca3d21cb653a74bb4c0470f5790295cb2fabfac9,a3bdca62bad476d1f3bc050469eb627ccea5bb43..25631ef1d943bd1e2860a1c1192fca824c4f509b
--- 1/Lib/socket.py
--- 2/Lib/socket.py
+++ b/Lib/socket.py
@@@ -71,16 -73,11 +73,16 @@@ AddressFamily = IntEnum('AddressFamily'
                           if name.isupper() and name.startswith('AF_')})
  globals().update(AddressFamily.__members__)
  
- SocketType = IntEnum('SocketType',
+ SocketKind = IntEnum('SocketKind',
                       {name: value for name, value in globals().items()
                        if name.isupper() and name.startswith('SOCK_')})
- globals().update(SocketType.__members__)
+ globals().update(SocketKind.__members__)
  
 +
 +_LOCALHOST    = '127.0.0.1'
 +_LOCALHOST_V6 = '::1'
 +
 +
  def _intenum_converter(value, enum_klass):
      """Convert a numeric family value to an IntEnum member.
  

diff --cc Lib/test/test_socket.py
Simple merge