From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 31 Dec 2008 03:37:51 +0000 (+0000)
Subject: #4788 qualify some bare except clauses
X-Git-Tag: v2.7a1~2457
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43ea6d9acc5227976ab0deeef0243cfaf5b0be71;p=thirdparty%2FPython%2Fcpython.git

#4788 qualify some bare except clauses
---

diff --git a/Lib/ssl.py b/Lib/ssl.py
index 21ae4053750f..03a317b7e061 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -103,7 +103,7 @@ class SSLSocket (socket):
         # see if it's connected
         try:
             socket.getpeername(self)
-        except:
+        except socket.error:
             # no, no connection yet
             self._sslobj = None
         else:
@@ -441,7 +441,7 @@ def sslwrap_simple (sock, keyfile=None, certfile=None):
                             PROTOCOL_SSLv23, None)
     try:
         sock.getpeername()
-    except:
+    except socket.error:
         # no, no connection yet
         pass
     else: