From 98204fe7b686ccff79d3f195355ac857ef27e56f Mon Sep 17 00:00:00 2001
From: Denis Bilenko <denis@ag-projects.com>
Date: Mon, 27 Oct 2008 22:47:46 +0600
Subject: [PATCH] made hubs other than twistedr compatible with newer
 trampoline

---
 eventlet/hubs/hub.py      | 1 +
 eventlet/hubs/libev.py    | 1 +
 eventlet/hubs/libevent.py | 1 +
 eventlet/hubs/nginx.py    | 3 ++-
 eventlet/hubs/poll.py     | 3 ++-
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/eventlet/hubs/hub.py b/eventlet/hubs/hub.py
index 33b24fb..e6f6478 100644
--- a/eventlet/hubs/hub.py
+++ b/eventlet/hubs/hub.py
@@ -94,6 +94,7 @@ class BaseHub(object):
         else:
             self.excs.pop(fileno, None)
         self.waiters_by_greenlet[greenlet.getcurrent()] = fileno
+        return fileno
         
     def remove_descriptor(self, fileno):
         self.readers.pop(fileno, None)
diff --git a/eventlet/hubs/libev.py b/eventlet/hubs/libev.py
index 241d104..423ce84 100644
--- a/eventlet/hubs/libev.py
+++ b/eventlet/hubs/libev.py
@@ -65,6 +65,7 @@ class Hub(hub.BaseHub):
             self.excs[fileno] = exc
 
         self.waiters_by_greenlet[greenlet.getcurrent()] = fileno
+        return fileno
 
     def remove_descriptor(self, fileno):
         for queue in (self.readers, self.writers):
diff --git a/eventlet/hubs/libevent.py b/eventlet/hubs/libevent.py
index cd50afa..cc8cd1d 100644
--- a/eventlet/hubs/libevent.py
+++ b/eventlet/hubs/libevent.py
@@ -74,6 +74,7 @@ class Hub(hub.BaseHub):
             self.excs[fileno] = exc
 
         self.waiters_by_greenlet[greenlet.getcurrent()] = fileno
+        return fileno
 
     def remove_descriptor(self, fileno):
         for queue in (self.readers, self.writers):
diff --git a/eventlet/hubs/nginx.py b/eventlet/hubs/nginx.py
index b25ab39..3d5a905 100644
--- a/eventlet/hubs/nginx.py
+++ b/eventlet/hubs/nginx.py
@@ -84,7 +84,7 @@ class Hub(hub.BaseHub):
         print "ADD DESCRIPTOR", fileno, read, write, exc
         traceback.print_stack()
 
-        super(Hub, self).add_descriptor(fileno, read, write, exc)
+        result = super(Hub, self).add_descriptor(fileno, read, write, exc)
         flag = 0
         if read:
             flag |= WSGI_POLLIN
@@ -94,6 +94,7 @@ class Hub(hub.BaseHub):
         self._connection_wrappers[fileno] = conn
         print "POLL REGISTER", flag
         self.poll_register(conn, flag)
+        return result
 
     def remove_descriptor(self, fileno):
         super(Hub, self).remove_descriptor(fileno)
diff --git a/eventlet/hubs/poll.py b/eventlet/hubs/poll.py
index 795cda8..b0f741b 100644
--- a/eventlet/hubs/poll.py
+++ b/eventlet/hubs/poll.py
@@ -45,12 +45,13 @@ class Hub(hub.BaseHub):
 
     def add_descriptor(self, fileno, read=None, write=None, exc=None):
         oldmask = self.get_fn_mask(self.readers.get(fileno), self.writers.get(fileno))
-        super(Hub, self).add_descriptor(fileno, read, write, exc)
+        result = super(Hub, self).add_descriptor(fileno, read, write, exc)
 
         mask = self.get_fn_mask(read, write)
         if mask != oldmask:
             # Only need to re-register this fileno if the mask changes
             self.poll.register(fileno, mask)
+        return result
 
     def get_fn_mask(self, read, write):
         mask = 0