summaryrefslogtreecommitdiffstats
path: root/Lib/ftplib.py
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2015-11-02 05:04:46 (GMT)
committerRaymond Hettinger <python@rcn.com>2015-11-02 05:04:46 (GMT)
commit0bdf9ea136c4acca2de0fe6ab799ab35d5b09fd2 (patch)
tree4b47f7e8db6a919ad9e1dd8da0f21144754e7ffa /Lib/ftplib.py
parent67b97b8f8dc792aa7e1130a52a0ccc5069c400ed (diff)
parente56a9191000d2ff15d7550b9c852fa6dee9b8f50 (diff)
downloadcpython-0bdf9ea136c4acca2de0fe6ab799ab35d5b09fd2.zip
cpython-0bdf9ea136c4acca2de0fe6ab799ab35d5b09fd2.tar.gz
cpython-0bdf9ea136c4acca2de0fe6ab799ab35d5b09fd2.tar.bz2
merge
Diffstat (limited to 'Lib/ftplib.py')
-rw-r--r--Lib/ftplib.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index 54b0e2c..c416d85 100644
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -287,7 +287,7 @@ class FTP:
return self.voidcmd(cmd)
def sendeprt(self, host, port):
- '''Send a EPRT command with the current host and the given port number.'''
+ '''Send an EPRT command with the current host and the given port number.'''
af = 0
if self.af == socket.AF_INET:
af = 1
@@ -852,7 +852,7 @@ def parse227(resp):
def parse229(resp, peer):
- '''Parse the '229' response for a EPSV request.
+ '''Parse the '229' response for an EPSV request.
Raises error_proto if it does not contain '(|||port|)'
Return ('host.addr.as.numbers', port#) tuple.'''