Merge branch 'master' into feature/GR-28392_ssl

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_xmlrpc.txt

@@ -10,8 +10,6 @@
 *graalpython.lib-python.3.test.test_xmlrpc.DateTimeTestCase.test_time
 *graalpython.lib-python.3.test.test_xmlrpc.DateTimeTestCase.test_time_struct
 *graalpython.lib-python.3.test.test_xmlrpc.DateTimeTestCase.test_time_tuple
-*graalpython.lib-python.3.test.test_xmlrpc.FailingServerTestCase.test_fail_no_info
-*graalpython.lib-python.3.test.test_xmlrpc.FailingServerTestCase.test_fail_with_info
 *graalpython.lib-python.3.test.test_xmlrpc.FaultTestCase.test_dotted_attribute
 *graalpython.lib-python.3.test.test_xmlrpc.FaultTestCase.test_repr
 *graalpython.lib-python.3.test.test_xmlrpc.GzipUtilTestCase.test_gzip_decode_limit

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SocketModuleBuiltins.java

@@ -84,6 +84,7 @@
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
+import com.oracle.graal.python.util.IPAddressUtil;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.TruffleLanguage;
@@ -96,8 +97,6 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.profiles.BranchProfile;
 
-import sun.net.util.IPAddressUtil;
-
 @CoreFunctions(defineModule = "_socket")
 public class SocketModuleBuiltins extends PythonBuiltins {
     // address families

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/socket/PSocket.java

@@ -109,6 +109,7 @@ private static InetSocketAddress getEphemeralAddress() {
     private SocketChannel socket;
 
     private ServerSocketChannel serverSocket;
+
     private boolean blocking = true;
 
     private HashMap<Object, Object> options;