]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Remove use of deprecated `array.fromstring` method (GH-17332)
authorDavid Coles <coles.david@gmail.com>
Tue, 26 Nov 2019 06:31:09 +0000 (22:31 -0800)
committerInada Naoki <songofacandy@gmail.com>
Tue, 26 Nov 2019 06:31:09 +0000 (15:31 +0900)
Doc/library/socket.rst
Doc/tools/susp-ignored.csv

index 62552bcbe24c1515b7ca3751ddf9c0c40b3fb6ae..2d7ca33f2927dcc4e5facb073a431b8c4d9e4bd6 100755 (executable)
@@ -1411,9 +1411,9 @@ to sockets.
           fds = array.array("i")   # Array of ints
           msg, ancdata, flags, addr = sock.recvmsg(msglen, socket.CMSG_LEN(maxfds * fds.itemsize))
           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.fromstring(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)
 
    .. availability:: most Unix platforms, possibly others.
index 7615f24e6cf16ac51f12b6ff7a679cdff8f990ef..5cdfd40f5b027e51205b65376c18ec2b87744f64 100644 (file)
@@ -201,7 +201,7 @@ library/readline,,:bind,"python:bind ^I rl_complete"
 library/smtplib,,:port,method must support that as well as a regular host:port
 library/socket,,::,'5aef:2b::8'
 library/socket,,:can,"return (can_id, can_dlc, data[:can_dlc])"
-library/socket,,:len,fds.fromstring(cmsg_data[:len(cmsg_data) - (len(cmsg_data) % fds.itemsize)])
+library/socket,,:len,fds.frombytes(cmsg_data[:len(cmsg_data) - (len(cmsg_data) % fds.itemsize)])
 library/sqlite3,,:age,"cur.execute(""select * from people where name_last=:who and age=:age"", {""who"": who, ""age"": age})"
 library/sqlite3,,:memory,
 library/sqlite3,,:who,"cur.execute(""select * from people where name_last=:who and age=:age"", {""who"": who, ""age"": age})"