fixes for hub debugging tools

ask · ask · commit 859dbe5dc0d7 · 2013-05-02T15:41:46.000+01:00
diff --git a/celery/worker/hub.py b/celery/worker/hub.py
@@ -278,27 +278,29 @@ def close(self, *args):
     __exit__ = close
 
     def _repr_readers(self):
-        return ['{0}->{1}->{2!r}'.format(_rcb(cb), repr_flag(READ | ERR, fd))
+        return ['{0}->{1}'.format(_rcb(cb), repr_flag(READ | ERR, fd))
                 for fd, cb in items(self.readers)]
 
     def _repr_writers(self):
-        return ['{0}->{1}->{2!r}'.format(_rcb(cb), repr_flag(WRITE, fd))
+        return ['{0}->{1}'.format(_rcb(cb), repr_flag(WRITE, fd))
                 for fd, cb in items(self.writers)]
 
     def repr_active(self):
         return ', '.join(self._repr_readers() + self._repr_writers())
 
     def repr_events(self, events):
         return ', '.join(
-            '{0}->{1}' % (
+            '{0}->{1}'.format(
                 _rcb(self._callback_for(fd, fl, '{0!r}(GONE)'.format(fd))),
-                repr_flag(fl)
+                repr_flag(fl),
             )
             for fd, fl in events
         )
 
     def _callback_for(self, fd, flag, *default):
         try:
+            if fd in self.coros:
+                return self.coros[fd]
             if flag & READ:
                 return self.readers[fileno(fd)]
             if flag & WRITE:
