[Jython-checkins] jython: Merged PR #75 / PR #77 -- Fix #2585 test_ssl test failure

[stefan.richthofer]

https://hg.python.org/jython/rev/7ad8eedaa14a
changeset:   8078:7ad8eedaa14a
user:        James Mudd <james.mudd at gmail.com>
date:        Fri May 05 01:30:47 2017 +0200
summary:
  Merged PR #75 / PR #77 -- Fix #2585 test_ssl test failure

files:
  Lib/_socket.py |  4 ++++
  NEWS           |  1 +
  build.xml      |  2 --
  3 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/Lib/_socket.py b/Lib/_socket.py
--- a/Lib/_socket.py
+++ b/Lib/_socket.py
@@ -355,6 +355,10 @@
         # need to work around.
         if isinstance(java_exception, java.net.ConnectException):
             mapped_exception = _exception_map.get(java.net.ConnectException)
+        # Netty AnnotatedNoRouteToHostException extends NoRouteToHostException
+        # so also needs work around.
+        elif isinstance(java_exception, java.net.NoRouteToHostException):
+            mapped_exception = _exception_map.get(java.net.NoRouteToHostException)
         else:
             mapped_exception = _exception_map.get(java_exception.__class__)
         if mapped_exception:
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@
 
 Jython 2.7.1rc1
   Bugs fixed
+    - [ 2585 ] test_ssl failure due to Netty exception mapping
     - [ 2313 ] test_jython_initializer failure on Windows
     - [ 2399 ] test_sort failure on Java 8
     - [ 2309 ] test_classpathimporter fails on Windows.
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -1110,7 +1110,6 @@
             <arg value="--exclude"/>
             <arg value="test_select_new"/>
             <arg value="test_socket"/>
-            <arg value="test_ssl"/>
         </exec>
     </target>
 
@@ -1129,7 +1128,6 @@
             <arg value="--exclude"/>
             <arg value="test_select_new"/>
             <arg value="test_socket"/>
-            <arg value="test_ssl"/>
         </exec>
     </target>
 

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