summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2013-10-28 08:39:04 (GMT)
committerRaymond Hettinger <python@rcn.com>2013-10-28 08:39:04 (GMT)
commitcbcb1e8f84557b06af9fbead2411c6eaa87a39e0 (patch)
treef09ec49f687e552361321345d5652e6cbe9d9307
parent9fa6a8ba63dc409a0a50605c59adfdc58f7b0085 (diff)
downloadcpython-cbcb1e8f84557b06af9fbead2411c6eaa87a39e0.zip
cpython-cbcb1e8f84557b06af9fbead2411c6eaa87a39e0.tar.gz
cpython-cbcb1e8f84557b06af9fbead2411c6eaa87a39e0.tar.bz2
Fix unintended switch from a constant to a global in 56a3c0bc4634
-rw-r--r--Lib/heapq.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/heapq.py b/Lib/heapq.py
index 19037ab..4b2c0c4 100644
--- a/Lib/heapq.py
+++ b/Lib/heapq.py
@@ -380,7 +380,7 @@ def merge(*iterables):
while _len(h) > 1:
try:
- while True:
+ while 1:
v, itnum, next = s = h[0]
yield v
s[0] = next() # raises StopIteration when exhausted