gh-112125: Fix None.__ne__(None) returning NotImplemented instead of False (#112504)

andrewluotechnologies · web-flow · commit 9c3458e05865 · 2023-12-07T13:56:01.000+01:00
diff --git a/Include/internal/pycore_typeobject.h b/Include/internal/pycore_typeobject.h
@@ -135,6 +135,8 @@ extern PyObject* _Py_type_getattro_impl(PyTypeObject *type, PyObject *name,
                                         int *suppress_missing_attribute);
 extern PyObject* _Py_type_getattro(PyTypeObject *type, PyObject *name);
 
+extern PyObject* _Py_BaseObject_RichCompare(PyObject* self, PyObject* other, int op);
+
 extern PyObject* _Py_slot_tp_getattro(PyObject *self, PyObject *name);
 extern PyObject* _Py_slot_tp_getattr_hook(PyObject *self, PyObject *name);
 
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
@@ -627,6 +627,11 @@ def __dir__(self):
         # test that object has a __dir__()
         self.assertEqual(sorted([].__dir__()), dir([]))
 
+    def test___ne__(self):
+        self.assertFalse(None.__ne__(None))
+        self.assertTrue(None.__ne__(0))
+        self.assertTrue(None.__ne__("abc"))
+
     def test_divmod(self):
         self.assertEqual(divmod(12, 7), (1, 5))
         self.assertEqual(divmod(-12, 7), (-2, 2))
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-12-07-13-19-55.gh-issue-112125.4ADN7i.rst b/Misc/NEWS.d/next/Core and Builtins/2023-12-07-13-19-55.gh-issue-112125.4ADN7i.rst
@@ -0,0 +1 @@
+Fix None.__ne__(None) returning NotImplemented instead of False
diff --git a/Objects/object.c b/Objects/object.c
@@ -2026,7 +2026,7 @@ PyTypeObject _PyNone_Type = {
     0,                  /*tp_doc */
     0,                  /*tp_traverse */
     0,                  /*tp_clear */
-    0,                  /*tp_richcompare */
+    _Py_BaseObject_RichCompare, /*tp_richcompare */
     0,                  /*tp_weaklistoffset */
     0,                  /*tp_iter */
     0,                  /*tp_iternext */
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -5625,6 +5625,12 @@ object_richcompare(PyObject *self, PyObject *other, int op)
     return res;
 }
 
+PyObject*
+_Py_BaseObject_RichCompare(PyObject* self, PyObject* other, int op)
+{
+    return object_richcompare(self, other, op);
+}
+
 static PyObject *
 object_get_class(PyObject *self, void *closure)
 {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix None.__ne__(None) returning NotImplemented instead of False`
Original file line number	Diff line number	Diff line change
`@@ -5625,6 +5625,12 @@ object_richcompare(PyObject self, PyObject other, int op)`
`5625`	`5625`	`return res;`
`5626`	`5626`	`}`
`5627`	`5627`
	`5628`	`+PyObject*`
	`5629`	`+_Py_BaseObject_RichCompare(PyObject* self, PyObject* other, int op)`
	`5630`	`+{`
	`5631`	`+ return object_richcompare(self, other, op);`
	`5632`	`+}`
	`5633`	`+`
`5628`	`5634`	`static PyObject *`
`5629`	`5635`	`object_get_class(PyObject self, void closure)`
`5630`	`5636`	`{`