[Python-checkins] cpython (merge 3.3 -> default): merge

[raymond.hettinger]

http://hg.python.org/cpython/rev/f23814bab066
changeset:   82487:f23814bab066
parent:      82485:f349e03bb41f
parent:      82486:b691f25c3553
user:        Raymond Hettinger <python at rcn.com>
date:        Tue Mar 05 02:11:37 2013 -0500
summary:
  merge

files:
  Lib/heapq.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/heapq.py b/Lib/heapq.py
--- a/Lib/heapq.py
+++ b/Lib/heapq.py
@@ -320,7 +320,7 @@
     heap[pos] = newitem
 
 def _siftup_max(heap, pos):
-    'Minheap variant of _siftup'
+    'Maxheap variant of _siftup'
     endpos = len(heap)
     startpos = pos
     newitem = heap[pos]

-- 
Repository URL: http://hg.python.org/cpython