From 7e7057fe6d6c5c4c7a7daf3bbb1b218d1ecc6743 Mon Sep 17 00:00:00 2001 From: Ryan Williams Date: Mon, 31 Aug 2009 14:16:15 -0400 Subject: [PATCH] Fix for http://bitbucket.org/which_linden/eventlet/issue/2/more-issues-with-python-26. Thanks for the report, anonymous. :-) --- eventlet/greenio.py | 4 ++++ tests/greenio_test.py | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/eventlet/greenio.py b/eventlet/greenio.py index e15c6ef..a4c0a5f 100644 --- a/eventlet/greenio.py +++ b/eventlet/greenio.py @@ -188,6 +188,10 @@ class GreenSocket(object): # when client calls setblocking(0) or settimeout(0) the socket must # act non-blocking self.act_non_blocking = False + + @property + def _sock(self): + return self @property def family(self): diff --git a/tests/greenio_test.py b/tests/greenio_test.py index f9ddbe2..be4e3e0 100644 --- a/tests/greenio_test.py +++ b/tests/greenio_test.py @@ -219,6 +219,15 @@ class TestGreenIo(LimitedTestCase): self.assert_(len(results1) > 0) self.assert_(len(results2) > 0) + + def test_wrap_socket(self): + try: + import ssl + except ImportError: + pass # pre-2.6 + else: + sock = api.tcp_listener(('127.0.0.1', 0)) + ssl_sock = ssl.wrap_socket(sock) class SSLTest(LimitedTestCase):