Merge branch 'main' into pythongh-78707-remove

.github/workflows/build.yml

@@ -8,19 +8,11 @@ on:
   push:
     branches:
     - 'main'
-    - '3.12'
-    - '3.11'
-    - '3.10'
-    - '3.9'
-    - '3.8'
+    - '3.*'
   pull_request:
     branches:
     - 'main'
-    - '3.12'
-    - '3.11'
-    - '3.10'
-    - '3.9'
-    - '3.8'
+    - '3.*'
 
 permissions:
   contents: read

Doc/library/constants.rst

@@ -57,6 +57,9 @@ A small number of constants live in the built-in namespace.  They are:
       it currently evaluates as true, it will emit a :exc:`DeprecationWarning`.
       It will raise a :exc:`TypeError` in a future version of Python.
 
+   .. versionchanged:: 3.14
+      Evaluating :data:`!NotImplemented` in a boolean context now raises a :exc:`TypeError`.
+
 
 .. index:: single: ...; ellipsis literal
 .. data:: Ellipsis

Doc/library/email.message.rst

@@ -41,7 +41,7 @@ The :class:`EmailMessage` dictionary-like interface is indexed by the header
 names, which must be ASCII values.  The values of the dictionary are strings
 with some extra methods.  Headers are stored and returned in case-preserving
 form, but field names are matched case-insensitively.  The keys are ordered,
-but unlike a real dict, there can be duplicates.  Addtional methods are
+but unlike a real dict, there can be duplicates.  Additional methods are
 provided for working with headers that have duplicate keys.
 
 The *payload* is either a string or bytes object, in the case of simple message

Doc/library/idle.rst

@@ -429,7 +429,7 @@ Several non-character keys move the cursor and possibly
 delete characters.  Deletion does not puts text on the clipboard,
 but IDLE has an undo list.  Wherever this doc discusses keys,
 'C' refers to the :kbd:`Control` key on Windows and
-Unix and the :kbd:`Command` key on macOS.  (And all such dicussions
+Unix and the :kbd:`Command` key on macOS.  (And all such discussions
 assume that the keys have not been re-bound to something else.)
 
 * Arrow keys move the cursor one character or line.

Doc/library/pyexpat.rst

@@ -210,7 +210,7 @@ XMLParser Objects
    by default until a sufficient amount of input is reached.
    Due to this delay, registered handlers may — depending of the sizing of
    input chunks pushed to Expat — no longer be called right after pushing new
-   input to the parser.  Where immediate feedback and taking over responsiblity
+   input to the parser.  Where immediate feedback and taking over responsibility
    of protecting against denial of service from large tokens are both wanted,
    calling ``SetReparseDeferralEnabled(False)`` disables reparse deferral
    for the current Expat parser instance, temporarily or altogether.

Doc/library/sys.monitoring.rst

@@ -160,7 +160,7 @@ events, use the expression ``PY_RETURN | PY_START``.
 
 .. monitoring-event:: NO_EVENTS
 
-    An alias for ``0`` so users can do explict comparisions like::
+    An alias for ``0`` so users can do explicit comparisons like::
 
       if get_events(DEBUGGER_ID) == NO_EVENTS:
           ...

Doc/reference/datamodel.rst

@@ -174,6 +174,9 @@ for more details.
    it currently evaluates as true, it will emit a :exc:`DeprecationWarning`.
    It will raise a :exc:`TypeError` in a future version of Python.
 
+.. versionchanged:: 3.14
+   Evaluating :data:`NotImplemented` in a boolean context now raises a :exc:`TypeError`.
+
 
 Ellipsis
 --------

Doc/whatsnew/3.14.rst

@@ -101,6 +101,11 @@ Deprecated
 Removed
 =======
 
+* Using :data:`NotImplemented` in a boolean context will now raise a :exc:`TypeError`.
+  It had previously raised a :exc:`DeprecationWarning` since Python 3.9. (Contributed
+  by Jelle Zijlstra in :gh:`118767`.)
+
+
 pathlib
 -------
 

Lib/test/test_builtin.py

@@ -2130,14 +2130,11 @@ def test_warning_notimplemented(self):
         # be evaluated in a boolean context (virtually all such use cases
         # are a result of accidental misuse implementing rich comparison
         # operations in terms of one another).
-        # For the time being, it will continue to evaluate as a true value, but
-        # issue a deprecation warning (with the eventual intent to make it
-        # a TypeError).
-        self.assertWarns(DeprecationWarning, bool, NotImplemented)
-        with self.assertWarns(DeprecationWarning):
+        self.assertRaises(TypeError, bool, NotImplemented)
+        with self.assertRaises(TypeError):
             self.assertTrue(NotImplemented)
-        with self.assertWarns(DeprecationWarning):
-            self.assertFalse(not NotImplemented)
+        with self.assertRaises(TypeError):
+            not NotImplemented
 
 
 class TestBreakpoint(unittest.TestCase):

Misc/NEWS.d/next/Core and Builtins/2024-05-08-09-44-15.gh-issue-118767.iFF5F5.rst

@@ -0,0 +1,2 @@
+Using :data:`NotImplemented` in a boolean context now raises
+:exc:`TypeError`. Contributed by Jelle Zijlstra in :gh:`118767`.

Objects/object.c

@@ -2090,13 +2090,9 @@ notimplemented_dealloc(PyObject *notimplemented)
 static int
 notimplemented_bool(PyObject *v)
 {
-    if (PyErr_WarnEx(PyExc_DeprecationWarning,
-                     "NotImplemented should not be used in a boolean context",
-                     1) < 0)
-    {
-        return -1;
-    }
-    return 1;
+    PyErr_SetString(PyExc_TypeError,
+                    "NotImplemented should not be used in a boolean context");
+    return -1;
 }
 
 static PyNumberMethods notimplemented_as_number = {