From: Gregory P. Smith <greg@mad-scientist.com>
Date: Sat, 12 Apr 2008 22:24:04 +0000 (+0000)
Subject: socket.error inherits from IOError, it no longer needs listing in
X-Git-Tag: v2.6a3~211
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6c03033afc58804cfdb143bef67e9cd37e25507;p=python

socket.error inherits from IOError, it no longer needs listing in
the all_errors tuple.
---

diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index 3a9f99492e..a915b2d31e 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)