[Python-checkins] Remove use of deprecated `array.fromstring` method (GH-17332)

Inada Naoki webhook-mailer at python.org
Tue Nov 26 01:31:13 EST 2019


https://github.com/python/cpython/commit/386d00cc341b549800776b906bfc6b20ea40c7db
commit: 386d00cc341b549800776b906bfc6b20ea40c7db
branch: master
author: David Coles <coles.david at gmail.com>
committer: Inada Naoki <songofacandy at gmail.com>
date: 2019-11-26T15:31:09+09:00
summary:

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

files:
M Doc/library/socket.rst
M Doc/tools/susp-ignored.csv

diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 62552bcbe24c1..2d7ca33f2927d 100755
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -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.
diff --git a/Doc/tools/susp-ignored.csv b/Doc/tools/susp-ignored.csv
index 7615f24e6cf16..5cdfd40f5b027 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})"



More information about the Python-checkins mailing list