From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 26 Nov 2019 06:37:31 +0000 (-0800)
Subject: Remove use of deprecated `array.fromstring` method (GH-17332)
X-Git-Tag: v3.7.6rc1~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f864016950079a618a916140f3abe6480a8e22d;p=thirdparty%2FPython%2Fcpython.git

Remove use of deprecated `array.fromstring` method (GH-17332)

(cherry picked from commit 386d00cc341b549800776b906bfc6b20ea40c7db)

Co-authored-by: David Coles <coles.david@gmail.com>
---

diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index b7262774b67b..178d7da2e5f0 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -1298,9 +1298,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.
diff --git a/Doc/tools/susp-ignored.csv b/Doc/tools/susp-ignored.csv
index 0c738f0204a2..a3c7cf6c8a2d 100644
--- a/Doc/tools/susp-ignored.csv
+++ b/Doc/tools/susp-ignored.csv
@@ -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})"