Clean up and add missing

Author: StanFromIreland

Doc/whatsnew/3.14.rst

@@ -567,16 +567,13 @@ getopt
 heapq
 -----
 
-* The max-heap functions in :mod:`heapq` are now public:
+* Add functions for working with max-heaps:
 
   * :func:`heapq.heapify_max`,
   * :func:`heapq.heappush_max`,
   * :func:`heapq.heappop_max`,
   * :func:`heapq.heapreplace_max`
-
-  Previous underscored naming is kept for backwards compatibility.
-  Additionally, the missing function :func:`heapq.heappushpop_max` has been added to both the C and Python
-  implementations.
+  * :func:`heapq.heappushpop_max`
 
 
 http

Lib/test/test_heapq.py

@@ -459,7 +459,8 @@ def test_cmp_err(self):
         seq = [CmpErr(), CmpErr(), CmpErr()]
         for f in (self.module.heapify, self.module.heappop):
             self.assertRaises(ZeroDivisionError, f, seq)
-        for f in (self.module.heappush, self.module.heapreplace):
+        for f in (self.module.heappush, self.module.heapreplace,
+                  self.module.heappush_max, self.module.heapreplace_max):
             self.assertRaises(ZeroDivisionError, f, seq, 10)
         for f in (self.module.nlargest, self.module.nsmallest):
             self.assertRaises(ZeroDivisionError, f, 2, seq)
@@ -541,6 +542,17 @@ def __lt__(self, o):
         self.assertRaises((IndexError, RuntimeError), self.module.heappush, list1, g(1))
         self.assertRaises((IndexError, RuntimeError), self.module.heappush, list2, h(1))
 
+        list1, list2 = [], []
+
+        self.module.heappush_max(list1, h(0))
+        self.module.heappush_max(list2, g(0))
+        self.module.heappush_max(list1, g(1))
+        self.module.heappush_max(list2, h(1))
+
+        TestHeap.check_max_invariant(self, list1)
+        TestHeap.check_max_invariant(self, list2)
+
+
 class TestErrorHandlingPython(TestErrorHandling, TestCase):
     module = py_heapq