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

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

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 9abf7974d193..8d1aae018ada 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 2f191ea7a44c..4c4a4498d6fd 100644
--- a/Lib/test/test_ftplib.py
+++ b/Lib/test/test_ftplib.py
@@ -542,8 +542,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')