gh-110067: Make max heap methods public and add missing ones

Lib/heapq.py

@@ -202,7 +202,7 @@ def heappush_max(heap, item):
 
 def heappushpop_max(heap, item):
     """Maxheap fast version of a heappush followed by a heappop."""
-    if heap and heap[0] < item:
+    if heap and heap[0] > item:
         item, heap[0] = heap[0], item
         _siftup_max(heap, 0)
     return item

Lib/test/test_heapq.py

@@ -208,11 +208,11 @@ def test_heappushpop_max(self):
 
         h = [10]
         x = self.module.heappushpop_max(h, 11)
-        self.assertTupleEqual((h, x), ([11], 10))
+        self.assertTupleEqual((h, x), ([10], 11))
 
         h = [10]
         x = self.module.heappushpop_max(h, 9)
-        self.assertTupleEqual((h, x), ([10], 9))
+        self.assertTupleEqual((h, x), ([9], 10))
 
     def test_heappop_max(self):
         # heapop_max has an optimization for one-item lists which isn't
@@ -515,13 +515,16 @@ class EvilClass(int):
             def __lt__(self, o):
                 heap.clear()
                 return NotImplemented
+            def __gt__(self, o):
+                heap.clear()
+                return NotImplemented
 
         heap = []
         self.module.heappush(heap, EvilClass(0))
         self.assertRaises(IndexError, self.module.heappushpop, heap, 1)
         heap = []
-        self.module.heappush_max(heap, EvilClass(0))
-        self.assertRaises(IndexError, self.module.heappushpop_max, heap, 1)
+        self.module.heappush_max(heap, EvilClass(1))
+        self.assertRaises(IndexError, self.module.heappushpop_max, heap, 0)
 
     def test_comparison_operator_modifiying_heap_two_heaps(self):
 

Modules/_heapqmodule.c

@@ -580,7 +580,7 @@ _heapq_heappushpop_max_impl(PyObject *module, PyObject *heap, PyObject *item)
 
     PyObject *top = PyList_GET_ITEM(heap, 0);
     Py_INCREF(top);
-    cmp = PyObject_RichCompareBool(top, item, Py_LT);
+    cmp = PyObject_RichCompareBool(top, item, Py_GT);
     Py_DECREF(top);
     if (cmp < 0) {
         return NULL;