Reduce changeset with respect to main

Author: miccoli

Lib/socket.py

@@ -563,8 +563,7 @@ def send_fds(sock, buffers, fds, flags=0, address=None):
         import array
 
         return sock.sendmsg(buffers, [(_socket.SOL_SOCKET,
-            _socket.SCM_RIGHTS, array.array("i", fds))],
-            flags, address)
+            _socket.SCM_RIGHTS, array.array("i", fds))], flags, address)
     __all__.append("send_fds")
 
 if hasattr(_socket.socket, "recvmsg"):
@@ -579,16 +578,13 @@ def recv_fds(sock, bufsize, maxfds, flags=0):
 
         # Array of ints
         fds = array.array("i")
-        msg, ancdata, msg_flags, addr = sock.recvmsg(
-            bufsize, _socket.CMSG_LEN(maxfds * fds.itemsize), flags
-            )
+        msg, ancdata, msg_flags, addr = sock.recvmsg(bufsize,
+            _socket.CMSG_LEN(maxfds * fds.itemsize), flags)
         for cmsg_level, cmsg_type, cmsg_data in ancdata:
-            if (cmsg_level == _socket.SOL_SOCKET
-                    and cmsg_type == _socket.SCM_RIGHTS):
+            if (cmsg_level == _socket.SOL_SOCKET and cmsg_type == _socket.SCM_RIGHTS):
                 # Append data, ignoring any truncated integers at the end.
-                fds.frombytes(
-                    cmsg_data[:len(cmsg_data) - (len(cmsg_data) % fds.itemsize)]
-                    )
+                fds.frombytes(cmsg_data[:
+                        len(cmsg_data) - (len(cmsg_data) % fds.itemsize)])
 
         return msg, list(fds), msg_flags, addr
     __all__.append("recv_fds")