From: Raymond Hettinger <python@rcn.com>
Date: Mon, 28 Oct 2013 08:39:04 +0000 (-0600)
Subject: Fix unintended switch from a constant to a global in 56a3c0bc4634
X-Git-Tag: v2.7.8~327
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a2325fac884e3e34af0476e05d6800cfba22ad8;p=thirdparty%2FPython%2Fcpython.git

Fix unintended switch from a constant to a global in 56a3c0bc4634
---

diff --git a/Lib/heapq.py b/Lib/heapq.py
index 19037ab1290e..4b2c0c444110 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