[Jython-checkins] jython: Do not double-wrap _sock._handle_channel_future (it is already decorated with

[darjus.loktevic]

https://hg.python.org/jython/rev/d9c65ac2a079
changeset:   7876:d9c65ac2a079
user:        Darjus Loktevic <darjus at gmail.com>
date:        Thu Jan 21 08:49:05 2016 +1100
summary:
  Do not double-wrap _sock._handle_channel_future (it is already decorated with @raises_java_exception) with SSLError in ssl.py as it masks the underlying error

files:
  Lib/ssl.py |  6 ++----
  1 files changed, 2 insertions(+), 4 deletions(-)


diff --git a/Lib/ssl.py b/Lib/ssl.py
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -628,10 +628,8 @@
             # http://stackoverflow.com/questions/24628271/exception-in-netty-io-netty-util-concurrent-blockingoperationexception
             # - we are doing this in the handler thread!
             return
-        try:
-            self._sock._handle_channel_future(handshake, "SSL handshake")
-        except socket_error, e:
-            raise SSLError(SSL_ERROR_SSL, e.strerror)
+
+        self._sock._handle_channel_future(handshake, "SSL handshake")
 
     def dup(self):
         raise NotImplemented("Can't dup() %s instances" %

-- 
Repository URL: https://hg.python.org/jython