From 9ba293115d8025a58eaf409ac9e6a1fca382d313 Mon Sep 17 00:00:00 2001
From: donovan <donovan@localhost>
Date: Sat, 28 Mar 2009 17:49:16 -0500
Subject: [PATCH] Fix test_socket by properly wrapping socketpair and fromfd in
 the eventlet.green.socket module.

---
 eventlet/green/socket.py | 11 +----------
 eventlet/greenio.py      | 10 ++++++++++
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/eventlet/green/socket.py b/eventlet/green/socket.py
index 5fddd06..648a99b 100644
--- a/eventlet/green/socket.py
+++ b/eventlet/green/socket.py
@@ -5,6 +5,7 @@ _fileobject = __socket._fileobject
 
 from eventlet.api import get_hub
 from eventlet.greenio import GreenSocket as socket, GreenSSL as _GreenSSL
+from eventlet.greenio import socketpair, fromfd
 
 def fromfd(*args):
     return socket(__socket.fromfd(*args))
@@ -33,16 +34,6 @@ def _gethostbyname_tpool(name):
 # XXX there're few more blocking functions in socket
 # XXX having a hub-independent way to access thread pool would be nice
 
-def socketpair(family=None, type=SOCK_STREAM, proto=0):
-    if family is None:
-        try:
-            family = AF_UNIX
-        except AttributeError:
-            family = AF_INET
-
-    a, b = __socket.socketpair(family, type, proto)
-    return socket(a), socket(b)
-
 
 _GLOBAL_DEFAULT_TIMEOUT = object()
 
diff --git a/eventlet/greenio.py b/eventlet/greenio.py
index 4678b09..c7796aa 100644
--- a/eventlet/greenio.py
+++ b/eventlet/greenio.py
@@ -547,3 +547,13 @@ class GreenSSL(GreenSocket):
     def issuer(self):
         return self.fd.issuer()
 
+
+
+def socketpair(*args):
+    one, two = socket.socketpair(*args)
+    return GreenSocket(one), GreenSocket(two)
+
+
+def fromfd(*args):
+    return GreenSocket(socket.fromfd(*args))
+