GR-9140: revert import socket patch

Author: cosminbasca

graalpython/lib-graalpython/_socket.py

@@ -46,3 +46,5 @@
 SOCK_RAW = 3
 SOCK_RDM = 4
 SOCK_SEQPACKET = 5
+
+has_ipv6 = False  #: TODO implement me

graalpython/lib-python/3/logging/handlers.py

@@ -22,9 +22,7 @@
 
 To use, simply 'import logging.handlers' and log away!
 """
-# TODO: Truffle reenable me once socket is supported (GR-9140)
-# import logging, socket, os, pickle, struct, time, re
-import logging, os, pickle, struct, time, re
+import logging, socket, os, pickle, struct, time, re
 from stat import ST_DEV, ST_INO, ST_MTIME
 # TODO: Truffle reenable me once queue and threading is supported (GR-9144)
 # import queue

graalpython/lib-python/3/platform.py

@@ -113,9 +113,7 @@
 __version__ = '1.0.8'
 
 import collections
-# TODO: Truffle reenable me once subprocess is supported (GR-9141)
-# import sys, os, re, subprocess
-import sys, os, re
+import sys, os, re, subprocess
 
 import warnings
 

graalpython/lib-python/3/test/support/__init__.py

@@ -19,12 +19,10 @@
 import platform
 import re
 import shutil
-# TODO: Truffle reenable me once supported (GR-9140)
-# import socket
+import socket
 import stat
 import struct
-# TODO: Truffle reenable me once supported (GR-9141)
-# import subprocess
+import subprocess
 import sys
 import sysconfig
 import tempfile
@@ -628,9 +626,7 @@ def wrapper(*args, **kw):
 HOSTv6 = "::1"
 
 
-# TODO: revert me once socket is implemented (GR-9140)
-# def find_unused_port(family=socket.AF_INET, socktype=socket.SOCK_STREAM):
-def find_unused_port(family, socktype):
+def find_unused_port(family=socket.AF_INET, socktype=socket.SOCK_STREAM):
     """Returns an unused port that should be suitable for binding.  This is
     achieved by creating a temporary socket with the same family and type as
     the 'sock' parameter (default is AF_INET, SOCK_STREAM), and binding it to
@@ -738,24 +734,22 @@ def bind_unix_socket(sock, addr):
         sock.close()
         raise unittest.SkipTest('cannot bind AF_UNIX sockets')
 
-# TODO: reenable me once socket is implemented (GR-9140)
-# def _is_ipv6_enabled():
-#     """Check whether IPv6 is enabled on this host."""
-#     if socket.has_ipv6:
-#         sock = None
-#         try:
-#             sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
-#             sock.bind((HOSTv6, 0))
-#             return True
-#         except OSError:
-#             pass
-#         finally:
-#             if sock:
-#                 sock.close()
-#     return False
-#
-# IPV6_ENABLED = _is_ipv6_enabled()
-IPV6_ENABLED = False
+def _is_ipv6_enabled():
+    """Check whether IPv6 is enabled on this host."""
+    if socket.has_ipv6:
+        sock = None
+        try:
+            sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+            sock.bind((HOSTv6, 0))
+            return True
+        except OSError:
+            pass
+        finally:
+            if sock:
+                sock.close()
+    return False
+
+IPV6_ENABLED = _is_ipv6_enabled()
 
 def system_must_validate_cert(f):
     """Skip the test on TLS certificate validation failures."""