Merge

AUTHORS

@@ -13,6 +13,7 @@ Contributors
 * Patrick Carlisle
 * Brantley Harris
 * Gregory Holt
+* Joe Malicki
 * Chet Murthy
 * Eugene Oden
 * radix

doc/real_index.html

@@ -41,7 +41,7 @@ easy_install eventlet
 
 <p>Alternately, you can download the source tarball:
 <ul>
-<li><a href="http://pypi.python.org/packages/source/e/eventlet/eventlet-0.9.5.tar.gz">eventlet-0.9.5.tar.gz</a></li>
+<li><a href="http://pypi.python.org/packages/source/e/eventlet/eventlet-0.9.6.tar.gz">eventlet-0.9.6.tar.gz</a></li>
 </ul>
 </p>
 

eventlet/__init__.py

@@ -1,4 +1,4 @@
-version_info = (0, 9, 6, "dev1")
+version_info = (0, 9, 6)
 __version__ = ".".join(map(str, version_info))
 
 try:

eventlet/green/socket.py

@@ -15,14 +15,20 @@ import warnings
 __patched__ = ['fromfd', 'socketpair', 'gethostbyname', 'create_connection',
                'ssl', 'socket']
 
-__original_fromfd__ = __socket.fromfd
+try:
-def fromfd(*args):
+    __original_fromfd__ = __socket.fromfd
-    return socket(__original_fromfd__(*args))
+    def fromfd(*args):
+        return socket(__original_fromfd__(*args))
+except AttributeError:
+    pass
 
-__original_socketpair__ = __socket.socketpair
+try:
-def socketpair(*args):
+    __original_socketpair__ = __socket.socketpair
-    one, two = __original_socketpair__(*args)
+    def socketpair(*args):
-    return socket(one), socket(two)
+        one, two = __original_socketpair__(*args)
+        return socket(one), socket(two)
+except AttributeError:
+    pass
 
 __original_gethostbyname__ = __socket.gethostbyname
 def gethostbyname(name):