summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory P. Smith <greg@mad-scientist.com>2008-04-12 22:24:04 (GMT)
committerGregory P. Smith <greg@mad-scientist.com>2008-04-12 22:24:04 (GMT)
commite6c03033afc58804cfdb143bef67e9cd37e25507 (patch)
tree77f3210076e18fa2b7f49905061b7903e82d6709
parent73bee444ab1ce9f4fb3f165b3cc814901032895e (diff)
downloadcpython-e6c03033afc58804cfdb143bef67e9cd37e25507.zip
cpython-e6c03033afc58804cfdb143bef67e9cd37e25507.tar.gz
cpython-e6c03033afc58804cfdb143bef67e9cd37e25507.tar.bz2
socket.error inherits from IOError, it no longer needs listing in
the all_errors tuple.
-rw-r--r--Lib/ftplib.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index 3a9f994..a915b2d 100644
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -65,7 +65,7 @@ class error_proto(Error): pass # response does not begin with [1-5]
# All exceptions (hopefully) that may be raised here and that aren't
# (always) programming errors on our side
-all_errors = (Error, socket.error, IOError, EOFError)
+all_errors = (Error, IOError, EOFError)
# Line terminators (we always output CRLF, but accept any of CRLF, CR, LF)