From: Raymond Hettinger <python@rcn.com>
Date: Sun, 14 Jul 2013 05:48:49 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.4.0a1~216
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=468bcaffd6e8417acef82051f24d225f73097037;p=thirdparty%2FPython%2Fcpython.git

merge
---

468bcaffd6e8417acef82051f24d225f73097037
diff --cc Lib/sched.py
index 9a82a89688d0,b9a7ad1afa2f..2e6b00a2a22e
--- a/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)))