Merge pull request #510 from python/main

Sync Fork from Upstream Repo

Author: sthagen

Doc/library/atexit.rst

@@ -48,11 +48,12 @@ internal error is detected, or when :func:`os._exit` is called.
 
 .. function:: unregister(func)
 
-   Remove *func* from the list of functions to be run at interpreter
-   shutdown.  After calling :func:`unregister`, *func* is guaranteed not to be
-   called when the interpreter shuts down, even if it was registered more than
-   once.  :func:`unregister` silently does nothing if *func* was not previously
-   registered.
+   Remove *func* from the list of functions to be run at interpreter shutdown.
+   :func:`unregister` silently does nothing if *func* was not previously
+   registered.  If *func* has been registered more than once, every occurrence
+   of that function in the :mod:`atexit` call stack will be removed.  Equality
+   comparisons (``==``) are used internally during unregistration, so function
+   references do not need to have matching identities.
 
 
 .. seealso::

Doc/library/contextlib.rst

@@ -515,6 +515,10 @@ Functions and classes provided:
       These context managers may suppress exceptions just as they normally
       would if used directly as part of a :keyword:`with` statement.
 
+      ... versionchanged:: 3.11
+          Raises :exc:`TypeError` instead of :exc:`AttributeError` if *cm*
+          is not a context manager.
+
    .. method:: push(exit)
 
       Adds a context manager's :meth:`__exit__` method to the callback stack.
@@ -585,6 +589,10 @@ Functions and classes provided:
       Similar to :meth:`enter_context` but expects an asynchronous context
       manager.
 
+      ... versionchanged:: 3.11
+          Raises :exc:`TypeError` instead of :exc:`AttributeError` if *cm*
+          is not an asynchronous context manager.
+
    .. method:: push_async_exit(exit)
 
       Similar to :meth:`push` but expects either an asynchronous context manager

Doc/library/graphlib.rst

@@ -154,9 +154,10 @@
 
    .. method:: static_order()
 
-      Returns an iterable of nodes in a topological order. Using this method
-      does not require to call :meth:`TopologicalSorter.prepare` or
-      :meth:`TopologicalSorter.done`. This method is equivalent to::
+      Returns an iterator object which will iterate over nodes in a topological
+      order. When using this method, :meth:`~TopologicalSorter.prepare` and
+      :meth:`~TopologicalSorter.done` should not be called. This method is
+      equivalent to::
 
           def static_order(self):
               self.prepare()
@@ -206,4 +207,4 @@ The :mod:`graphlib` module defines the following exception classes:
    The detected cycle can be accessed via the second element in the :attr:`~CycleError.args`
    attribute of the exception instance and consists in a list of nodes, such that each node is,
    in the graph, an immediate predecessor of the next node in the list. In the reported list,
-   the first and the last node will be the same, to make it clear that it is cyclic.
+   the first and the last node will be the same, to make it clear that it is cyclic.

Doc/tutorial/controlflow.rst

@@ -110,14 +110,14 @@ The given end point is never part of the generated sequence; ``range(10)`` gener
 is possible to let the range start at another number, or to specify a different
 increment (even negative; sometimes this is called the 'step')::
 
-    range(5, 10)
-       5, 6, 7, 8, 9
+    >>> list(range(5, 10))
+    [5, 6, 7, 8, 9]
 
-    range(0, 10, 3)
-       0, 3, 6, 9
+    >>> list(range(0, 10, 3))
+    [0, 3, 6, 9]
 
-    range(-10, -100, -30)
-      -10, -40, -70
+    >>> list(range(-10, -100, -30))
+    [-10, -40, -70]
 
 To iterate over the indices of a sequence, you can combine :func:`range` and
 :func:`len` as follows::
@@ -137,7 +137,7 @@ function, see :ref:`tut-loopidioms`.
 
 A strange thing happens if you just print a range::
 
-   >>> print(range(10))
+   >>> range(10)
    range(0, 10)
 
 In many ways the object returned by :func:`range` behaves as if it is a list,
@@ -155,13 +155,7 @@ that takes an iterable is :func:`sum`::
     6
 
 Later we will see more functions that return iterables and take iterables as
-arguments.  Lastly, maybe you are curious about how to get a list from a range.
-Here is the solution::
-
-   >>> list(range(4))
-   [0, 1, 2, 3]
-
-In chapter :ref:`tut-structures`, we will discuss in more detail about
+arguments.  In chapter :ref:`tut-structures`, we will discuss in more detail about
 :func:`list`.
 
 .. _tut-break:

Doc/whatsnew/3.10.rst

@@ -278,7 +278,7 @@ have been incorporated. Some of the most notable ones are as follows:
 
     .. code-block:: python
 
-        >>> try
+        >>> try:
         ...     x = 2
         ... something = 3
           File "<stdin>", line 3
@@ -1084,7 +1084,7 @@ and will be incorrect in some rare cases, including some ``_``-s in
 importlib.metadata
 ------------------
 
-Feature parity with ``importlib_metadata`` 4.4
+Feature parity with ``importlib_metadata`` 4.6
 (`history <https://importlib-metadata.readthedocs.io/en/latest/history.html>`_).
 
 :ref:`importlib.metadata entry points <entry-points>`

Doc/whatsnew/3.11.rst

@@ -75,6 +75,18 @@ New Features
 Other Language Changes
 ======================
 
+A :exc:`TypeError` is now raised instead of an :exc:`AttributeError` in
+:meth:`contextlib.ExitStack.enter_context` and
+:meth:`contextlib.AsyncExitStack.enter_async_context` for objects which do not
+support the :term:`context manager` or :term:`asynchronous context manager`
+protocols correspondingly.
+(Contributed by Serhiy Storchaka in :issue:`44471`.)
+
+* A :exc:`TypeError` is now raised instead of an :exc:`AttributeError` in
+  :keyword:`with` and :keyword:`async with` statements for objects which do not
+  support the :term:`context manager` or :term:`asynchronous context manager`
+  protocols correspondingly.
+  (Contributed by Serhiy Storchaka in :issue:`12022`.)
 
 
 New Modules

Lib/abc.py

@@ -28,7 +28,14 @@ def my_abstract_method(self, ...):
 class abstractclassmethod(classmethod):
     """A decorator indicating abstract classmethods.
 
-    Deprecated, use 'classmethod' with 'abstractmethod' instead.
+    Deprecated, use 'classmethod' with 'abstractmethod' instead:
+
+        class C(ABC):
+            @classmethod
+            @abstractmethod
+            def my_abstract_classmethod(cls, ...):
+                ...
+
     """
 
     __isabstractmethod__ = True
@@ -41,7 +48,14 @@ def __init__(self, callable):
 class abstractstaticmethod(staticmethod):
     """A decorator indicating abstract staticmethods.
 
-    Deprecated, use 'staticmethod' with 'abstractmethod' instead.
+    Deprecated, use 'staticmethod' with 'abstractmethod' instead:
+
+        class C(ABC):
+            @staticmethod
+            @abstractmethod
+            def my_abstract_staticmethod(...):
+                ...
+
     """
 
     __isabstractmethod__ = True
@@ -54,7 +68,14 @@ def __init__(self, callable):
 class abstractproperty(property):
     """A decorator indicating abstract properties.
 
-    Deprecated, use 'property' with 'abstractmethod' instead.
+    Deprecated, use 'property' with 'abstractmethod' instead:
+
+        class C(ABC):
+            @property
+            @abstractmethod
+            def my_abstract_property(self):
+                ...
+
     """
 
     __isabstractmethod__ = True

Lib/asyncio/trsock.py

@@ -1,5 +1,4 @@
 import socket
-import warnings
 
 
 class TransportSocket:
@@ -16,13 +15,6 @@ class TransportSocket:
     def __init__(self, sock: socket.socket):
         self._sock = sock
 
-    def _na(self, what):
-        warnings.warn(
-            f"Using {what} on sockets returned from get_extra_info('socket') "
-            f"will be prohibited in asyncio 3.9. Please report your use case "
-            f"to bugs.python.org.",
-            DeprecationWarning, source=self)
-
     @property
     def family(self):
         return self._sock.family
@@ -90,98 +82,6 @@ def getsockname(self):
     def getsockbyname(self):
         return self._sock.getsockbyname()
 
-    def accept(self):
-        self._na('accept() method')
-        return self._sock.accept()
-
-    def connect(self, *args, **kwargs):
-        self._na('connect() method')
-        return self._sock.connect(*args, **kwargs)
-
-    def connect_ex(self, *args, **kwargs):
-        self._na('connect_ex() method')
-        return self._sock.connect_ex(*args, **kwargs)
-
-    def bind(self, *args, **kwargs):
-        self._na('bind() method')
-        return self._sock.bind(*args, **kwargs)
-
-    def ioctl(self, *args, **kwargs):
-        self._na('ioctl() method')
-        return self._sock.ioctl(*args, **kwargs)
-
-    def listen(self, *args, **kwargs):
-        self._na('listen() method')
-        return self._sock.listen(*args, **kwargs)
-
-    def makefile(self):
-        self._na('makefile() method')
-        return self._sock.makefile()
-
-    def sendfile(self, *args, **kwargs):
-        self._na('sendfile() method')
-        return self._sock.sendfile(*args, **kwargs)
-
-    def close(self):
-        self._na('close() method')
-        return self._sock.close()
-
-    def detach(self):
-        self._na('detach() method')
-        return self._sock.detach()
-
-    def sendmsg_afalg(self, *args, **kwargs):
-        self._na('sendmsg_afalg() method')
-        return self._sock.sendmsg_afalg(*args, **kwargs)
-
-    def sendmsg(self, *args, **kwargs):
-        self._na('sendmsg() method')
-        return self._sock.sendmsg(*args, **kwargs)
-
-    def sendto(self, *args, **kwargs):
-        self._na('sendto() method')
-        return self._sock.sendto(*args, **kwargs)
-
-    def send(self, *args, **kwargs):
-        self._na('send() method')
-        return self._sock.send(*args, **kwargs)
-
-    def sendall(self, *args, **kwargs):
-        self._na('sendall() method')
-        return self._sock.sendall(*args, **kwargs)
-
-    def set_inheritable(self, *args, **kwargs):
-        self._na('set_inheritable() method')
-        return self._sock.set_inheritable(*args, **kwargs)
-
-    def share(self, process_id):
-        self._na('share() method')
-        return self._sock.share(process_id)
-
-    def recv_into(self, *args, **kwargs):
-        self._na('recv_into() method')
-        return self._sock.recv_into(*args, **kwargs)
-
-    def recvfrom_into(self, *args, **kwargs):
-        self._na('recvfrom_into() method')
-        return self._sock.recvfrom_into(*args, **kwargs)
-
-    def recvmsg_into(self, *args, **kwargs):
-        self._na('recvmsg_into() method')
-        return self._sock.recvmsg_into(*args, **kwargs)
-
-    def recvmsg(self, *args, **kwargs):
-        self._na('recvmsg() method')
-        return self._sock.recvmsg(*args, **kwargs)
-
-    def recvfrom(self, *args, **kwargs):
-        self._na('recvfrom() method')
-        return self._sock.recvfrom(*args, **kwargs)
-
-    def recv(self, *args, **kwargs):
-        self._na('recv() method')
-        return self._sock.recv(*args, **kwargs)
-
     def settimeout(self, value):
         if value == 0:
             return
@@ -196,11 +96,3 @@ def setblocking(self, flag):
             return
         raise ValueError(
             'setblocking(): transport sockets cannot be blocking')
-
-    def __enter__(self):
-        self._na('context manager protocol')
-        return self._sock.__enter__()
-
-    def __exit__(self, *err):
-        self._na('context manager protocol')
-        return self._sock.__exit__(*err)

Lib/contextlib.py

@@ -473,9 +473,14 @@ def enter_context(self, cm):
         """
         # We look up the special methods on the type to match the with
         # statement.
-        _cm_type = type(cm)
-        _exit = _cm_type.__exit__
-        result = _cm_type.__enter__(cm)
+        cls = type(cm)
+        try:
+            _enter = cls.__enter__
+            _exit = cls.__exit__
+        except AttributeError:
+            raise TypeError(f"'{cls.__module__}.{cls.__qualname__}' object does "
+                            f"not support the context manager protocol") from None
+        result = _enter(cm)
         self._push_cm_exit(cm, _exit)
         return result
 
@@ -600,9 +605,15 @@ async def enter_async_context(self, cm):
         If successful, also pushes its __aexit__ method as a callback and
         returns the result of the __aenter__ method.
         """
-        _cm_type = type(cm)
-        _exit = _cm_type.__aexit__
-        result = await _cm_type.__aenter__(cm)
+        cls = type(cm)
+        try:
+            _enter = cls.__aenter__
+            _exit = cls.__aexit__
+        except AttributeError:
+            raise TypeError(f"'{cls.__module__}.{cls.__qualname__}' object does "
+                            f"not support the asynchronous context manager protocol"
+                           ) from None
+        result = await _enter(cm)
         self._push_async_cm_exit(cm, _exit)
         return result
 

Lib/importlib/metadata/__init__.py

@@ -362,14 +362,6 @@ def _parse_groups(text):
         )
 
 
-def flake8_bypass(func):
-    # defer inspect import as performance optimization.
-    import inspect
-
-    is_flake8 = any('flake8' in str(frame.filename) for frame in inspect.stack()[:5])
-    return func if not is_flake8 else lambda: None
-
-
 class Deprecated:
     """
     Compatibility add-in for mapping to indicate that
@@ -405,7 +397,7 @@ def __getitem__(self, name):
         return super().__getitem__(name)
 
     def get(self, name, default=None):
-        flake8_bypass(self._warn)()
+        self._warn()
         return super().get(name, default)
 
     def __iter__(self):