Eventlet/Gevent: Fixes dump_scheduled

celery/concurrency/eventlet.py

@@ -83,7 +83,7 @@ class Schedule(timer2.Schedule):
 
     @property
     def queue(self):
-        return [(g.eta, g.priority, g.entry) for g in self._queue]
+        return self._queue
 
 
 class Timer(timer2.Timer):

celery/concurrency/gevent.py

@@ -75,7 +75,7 @@ class Schedule(timer2.Schedule):
 
     @property
     def queue(self):
-        return [(g.eta, g.priority, g.entry) for g in self._queue]
+        return self._queue
 
 
 class Timer(timer2.Timer):

celery/worker/control.py

@@ -198,7 +198,7 @@ def dump_schedule(state, safe=False, **kwargs):
                 continue
             else:
                 if isinstance(arg0, Request):
-                    yield {'eta': waiting.eta,
+                    yield {'eta': arg0.eta.isoformat() if arg0.eta else None,
                            'priority': waiting.priority,
                            'request': arg0.info(safe=safe)}
     return list(prepare_entries())