From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 17 Feb 2024 12:54:31 +0000 (+0100)
Subject: [3.11] gh-97590: Update docs and tests for ftplib.FTP.voidcmd() (GH-96825) (GH-115602)
X-Git-Tag: v3.11.9~195
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c39d00a56209dd1f34bfaf9688e9ab560cd3281;p=thirdparty%2FPython%2Fcpython.git

[3.11] gh-97590: Update docs and tests for ftplib.FTP.voidcmd() (GH-96825) (GH-115602)

Since 2f3941d743481ac48628b8b2c075f2b82762050b this function returns the
response string, rather than nothing.
(cherry picked from commit e88ebc1c4028cf2f0db43659e513440257eaec01)

Co-authored-by: Matthew Hughes <34972397+matthewhughes934@users.noreply.github.com>
---

diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst
index f5686780213e..74c7bb63b8fc 100644
--- a/Doc/library/ftplib.rst
+++ b/Doc/library/ftplib.rst
@@ -232,8 +232,8 @@ FTP objects
    .. method:: FTP.voidcmd(cmd)
 
       Send a simple command string to the server and handle the response.  Return
-      nothing if a response code corresponding to success (codes in the range
-      200--299) is received.  Raise :exc:`error_reply` otherwise.
+      the response string if the response code corresponds to success (codes in
+      the range 200--299).  Raise :exc:`error_reply` otherwise.
 
       .. audit-event:: ftplib.sendcmd self,cmd ftplib.FTP.voidcmd
 
diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py
index a90a53f27866..d813ecdcd6fc 100644
--- a/Lib/test/test_ftplib.py
+++ b/Lib/test/test_ftplib.py
@@ -544,8 +544,8 @@ class TestFTPClass(TestCase):
         self.assertFalse(self.client.passiveserver)
 
     def test_voidcmd(self):
-        self.client.voidcmd('echo 200')
-        self.client.voidcmd('echo 299')
+        self.assertEqual(self.client.voidcmd('echo 200'), '200')
+        self.assertEqual(self.client.voidcmd('echo 299'), '299')
         self.assertRaises(ftplib.error_reply, self.client.voidcmd, 'echo 199')
         self.assertRaises(ftplib.error_reply, self.client.voidcmd, 'echo 300')