youtube-dl

commit 429491f531035f4fe9e958e6bf4108867107efec
parent e9c0cdd3895436170de33324c1762364380c6a5a
Author: Yen Chi Hsuan <yan12125@gmail.com>
Date:   Thu,  3 Mar 2016 21:55:17 +0800

[test/http] Fix failure in Jython

make offlinetest passed on the latest Jython hg version with patched
lib-python/2.7/urllib2.py pulled from CPython 2.7.11

Diffstat:
M
test/test_http.py
 | 
7
++++++-

1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/test/test_http.py b/test/test_http.py
@@ -52,7 +52,12 @@ class TestHTTP(unittest.TestCase):
             ('localhost', 0), HTTPTestRequestHandler)
         self.httpd.socket = ssl.wrap_socket(
             self.httpd.socket, certfile=certfn, server_side=True)
-        self.port = self.httpd.socket.getsockname()[1]
+        if os.name == 'java':
+            # In Jython SSLSocket is not a subclass of socket.socket
+            sock = self.httpd.socket.sock
+        else:
+            sock = self.httpd.socket
+        self.port = sock.getsockname()[1]
         self.server_thread = threading.Thread(target=self.httpd.serve_forever)
         self.server_thread.daemon = True
         self.server_thread.start()