merge

diff --cc Lib/sched.py
index 9a82a89688d0ea77ff3f05811bd404317cc2e4a7,b9a7ad1afa2f19d9634043773b77caef6e016316..2e6b00a2a22e8f9d2db9f80b84fda61b8c7a2c72
--- 1/Lib/sched.py
--- 2/Lib/sched.py
+++ b/Lib/sched.py
@@@ -164,4 -165,4 +164,4 @@@ class scheduler
          # the actual order they would be retrieved.
          with self._lock:
              events = self._queue[:]
-         return map(heapq.heappop, [events]*len(events))
 -            return list(map(heapq.heappop, [events]*len(events)))
++        return list(map(heapq.heappop, [events]*len(events)))

diff --cc Lib/test/test_sched.py
Simple merge

diff --cc Misc/NEWS
Simple merge