summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2024-02-17 12:54:50 (GMT)
committerGitHub <noreply@github.com>2024-02-17 12:54:50 (GMT)
commitd46a2a00086c16ee20840c0cce0fb03e9ea21fd0 (patch)
tree162f506369e86d022d4bf908a538223ca2a930b7
parentbf0e0729803c20298beda40af016e58510594a1d (diff)
downloadcpython-d46a2a00086c16ee20840c0cce0fb03e9ea21fd0.zip
cpython-d46a2a00086c16ee20840c0cce0fb03e9ea21fd0.tar.gz
cpython-d46a2a00086c16ee20840c0cce0fb03e9ea21fd0.tar.bz2
[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>
-rw-r--r--Doc/library/ftplib.rst4
-rw-r--r--Lib/test/test_ftplib.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst
index 9abf797..8d1aae0 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 2f191ea..4c4a449 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')