diff --git a/eventlet/green/socket.py b/eventlet/green/socket.py index 8fa6566..8afc635 100644 --- a/eventlet/green/socket.py +++ b/eventlet/green/socket.py @@ -8,10 +8,13 @@ from eventlet.util import wrap_ssl_obj from eventlet.greenio import GreenSocket as socket from eventlet.greenio import GreenSSL as _GreenSSL from eventlet.greenio import GreenSSLObject as _GreenSSLObject -from eventlet.greenio import socketpair, fromfd def fromfd(*args): - return socket(__socket.fromfd(*args)) + return socket(__socket.fromfd(*args)) + +def socketpair(*args): + one, two = __socket.socketpair(*args) + return socket(one), socket(two) def gethostbyname(name): if getattr(get_hub(), 'uses_twisted_reactor', None): diff --git a/eventlet/greenio.py b/eventlet/greenio.py index 38108fa..6d03d66 100644 --- a/eventlet/greenio.py +++ b/eventlet/greenio.py @@ -758,14 +758,3 @@ class GreenSSLObject(object): for debugging purposes; do not parse the content of this string because its format can't be parsed unambiguously.""" return str(self.connection.get_peer_certificate().get_issuer()) - - - -def socketpair(*args): - one, two = socket.socketpair(*args) - return GreenSocket(one), GreenSocket(two) - - -def fromfd(*args): - return GreenSocket(socket.fromfd(*args)) -