Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.11] GH-101100: Fix reference warnings for __enter__ and __exit__ (GH-110112) #111076

Merged
merged 1 commit into from
Oct 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Doc/glossary.rst
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ Glossary

context manager
An object which controls the environment seen in a :keyword:`with`
statement by defining :meth:`__enter__` and :meth:`__exit__` methods.
statement by defining :meth:`~object.__enter__` and :meth:`~object.__exit__` methods.
See :pep:`343`.

context variable
Expand Down
22 changes: 11 additions & 11 deletions Doc/library/contextlib.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Functions and classes provided:

This function is a :term:`decorator` that can be used to define a factory
function for :keyword:`with` statement context managers, without needing to
create a class or separate :meth:`__enter__` and :meth:`__exit__` methods.
create a class or separate :meth:`~object.__enter__` and :meth:`~object.__exit__` methods.

While many objects natively support use in with statements, sometimes a
resource needs to be managed that isn't a context manager in its own right,
Expand Down Expand Up @@ -508,7 +508,7 @@ Functions and classes provided:
# the with statement, even if attempts to open files later
# in the list raise an exception

The :meth:`__enter__` method returns the :class:`ExitStack` instance, and
The :meth:`~object.__enter__` method returns the :class:`ExitStack` instance, and
performs no additional operations.

Each instance maintains a stack of registered callbacks that are called in
Expand Down Expand Up @@ -536,9 +536,9 @@ Functions and classes provided:

.. method:: enter_context(cm)

Enters a new context manager and adds its :meth:`__exit__` method to
Enters a new context manager and adds its :meth:`~object.__exit__` method to
the callback stack. The return value is the result of the context
manager's own :meth:`__enter__` method.
manager's own :meth:`~object.__enter__` method.

These context managers may suppress exceptions just as they normally
would if used directly as part of a :keyword:`with` statement.
Expand All @@ -549,18 +549,18 @@ Functions and classes provided:

.. method:: push(exit)

Adds a context manager's :meth:`__exit__` method to the callback stack.
Adds a context manager's :meth:`~object.__exit__` method to the callback stack.

As ``__enter__`` is *not* invoked, this method can be used to cover
part of an :meth:`__enter__` implementation with a context manager's own
:meth:`__exit__` method.
part of an :meth:`~object.__enter__` implementation with a context manager's own
:meth:`~object.__exit__` method.

If passed an object that is not a context manager, this method assumes
it is a callback with the same signature as a context manager's
:meth:`__exit__` method and adds it directly to the callback stack.
:meth:`~object.__exit__` method and adds it directly to the callback stack.

By returning true values, these callbacks can suppress exceptions the
same way context manager :meth:`__exit__` methods can.
same way context manager :meth:`~object.__exit__` methods can.

The passed in object is returned from the function, allowing this
method to be used as a function decorator.
Expand Down Expand Up @@ -707,7 +707,7 @@ Cleaning up in an ``__enter__`` implementation

As noted in the documentation of :meth:`ExitStack.push`, this
method can be useful in cleaning up an already allocated resource if later
steps in the :meth:`__enter__` implementation fail.
steps in the :meth:`~object.__enter__` implementation fail.

Here's an example of doing this for a context manager that accepts resource
acquisition and release functions, along with an optional validation function,
Expand Down Expand Up @@ -864,7 +864,7 @@ And also as a function decorator::

Note that there is one additional limitation when using context managers
as function decorators: there's no way to access the return value of
:meth:`__enter__`. If that value is needed, then it is still necessary to use
:meth:`~object.__enter__`. If that value is needed, then it is still necessary to use
an explicit ``with`` statement.

.. seealso::
Expand Down
2 changes: 1 addition & 1 deletion Doc/library/stdtypes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4802,7 +4802,7 @@ before the statement body is executed and exited when the statement ends:
The exception passed in should never be reraised explicitly - instead, this
method should return a false value to indicate that the method completed
successfully and does not want to suppress the raised exception. This allows
context management code to easily detect whether or not an :meth:`__exit__`
context management code to easily detect whether or not an :meth:`~object.__exit__`
method has actually failed.

Python defines several context managers to support easy thread synchronisation,
Expand Down
2 changes: 1 addition & 1 deletion Doc/library/test.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1021,7 +1021,7 @@ The :mod:`test.support` module defines the following classes:
:const:`resource.RLIMIT_CORE`'s soft limit to 0 to prevent coredump file
creation.

On both platforms, the old value is restored by :meth:`__exit__`.
On both platforms, the old value is restored by :meth:`~object.__exit__`.


.. class:: SaveSignals()
Expand Down
4 changes: 2 additions & 2 deletions Doc/library/unittest.mock.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2480,8 +2480,8 @@ are closed properly and is becoming common::
f.write('something')

The issue is that even if you mock out the call to :func:`open` it is the
*returned object* that is used as a context manager (and has :meth:`__enter__` and
:meth:`__exit__` called).
*returned object* that is used as a context manager (and has :meth:`~object.__enter__` and
:meth:`~object.__exit__` called).

Mocking context managers with a :class:`MagicMock` is common enough and fiddly
enough that a helper function is useful. ::
Expand Down
20 changes: 10 additions & 10 deletions Doc/reference/compound_stmts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -491,37 +491,37 @@ The execution of the :keyword:`with` statement with one "item" proceeds as follo
#. The context expression (the expression given in the
:token:`~python-grammar:with_item`) is evaluated to obtain a context manager.

#. The context manager's :meth:`__enter__` is loaded for later use.
#. The context manager's :meth:`~object.__enter__` is loaded for later use.

#. The context manager's :meth:`__exit__` is loaded for later use.
#. The context manager's :meth:`~object.__exit__` is loaded for later use.

#. The context manager's :meth:`__enter__` method is invoked.
#. The context manager's :meth:`~object.__enter__` method is invoked.

#. If a target was included in the :keyword:`with` statement, the return value
from :meth:`__enter__` is assigned to it.
from :meth:`~object.__enter__` is assigned to it.

.. note::

The :keyword:`with` statement guarantees that if the :meth:`__enter__`
method returns without an error, then :meth:`__exit__` will always be
The :keyword:`with` statement guarantees that if the :meth:`~object.__enter__`
method returns without an error, then :meth:`~object.__exit__` will always be
called. Thus, if an error occurs during the assignment to the target list,
it will be treated the same as an error occurring within the suite would
be. See step 7 below.

#. The suite is executed.

#. The context manager's :meth:`__exit__` method is invoked. If an exception
#. The context manager's :meth:`~object.__exit__` method is invoked. If an exception
caused the suite to be exited, its type, value, and traceback are passed as
arguments to :meth:`__exit__`. Otherwise, three :const:`None` arguments are
arguments to :meth:`~object.__exit__`. Otherwise, three :const:`None` arguments are
supplied.

If the suite was exited due to an exception, and the return value from the
:meth:`__exit__` method was false, the exception is reraised. If the return
:meth:`~object.__exit__` method was false, the exception is reraised. If the return
value was true, the exception is suppressed, and execution continues with the
statement following the :keyword:`with` statement.

If the suite was exited for any reason other than an exception, the return
value from :meth:`__exit__` is ignored, and execution proceeds at the normal
value from :meth:`~object.__exit__` is ignored, and execution proceeds at the normal
location for the kind of exit that was taken.

The following code::
Expand Down
6 changes: 3 additions & 3 deletions Doc/reference/datamodel.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2920,7 +2920,7 @@ For more information on context managers, see :ref:`typecontextmanager`.
(i.e., prevent it from being propagated), it should return a true value.
Otherwise, the exception will be processed normally upon exit from this method.

Note that :meth:`__exit__` methods should not reraise the passed-in exception;
Note that :meth:`~object.__exit__` methods should not reraise the passed-in exception;
this is the caller's responsibility.


Expand Down Expand Up @@ -3192,12 +3192,12 @@ Asynchronous context managers can be used in an :keyword:`async with` statement.

.. method:: object.__aenter__(self)

Semantically similar to :meth:`__enter__`, the only
Semantically similar to :meth:`~object.__enter__`, the only
difference being that it must return an *awaitable*.

.. method:: object.__aexit__(self, exc_type, exc_value, traceback)

Semantically similar to :meth:`__exit__`, the only
Semantically similar to :meth:`~object.__exit__`, the only
difference being that it must return an *awaitable*.

An example of an asynchronous context manager class::
Expand Down
22 changes: 11 additions & 11 deletions Doc/whatsnew/2.5.rst
Original file line number Diff line number Diff line change
Expand Up @@ -575,15 +575,15 @@ structure is::
with-block

The expression is evaluated, and it should result in an object that supports the
context management protocol (that is, has :meth:`__enter__` and :meth:`__exit__`
context management protocol (that is, has :meth:`~object.__enter__` and :meth:`~object.__exit__`
methods.

The object's :meth:`__enter__` is called before *with-block* is executed and
The object's :meth:`~object.__enter__` is called before *with-block* is executed and
therefore can run set-up code. It also may return a value that is bound to the
name *variable*, if given. (Note carefully that *variable* is *not* assigned
the result of *expression*.)

After execution of the *with-block* is finished, the object's :meth:`__exit__`
After execution of the *with-block* is finished, the object's :meth:`~object.__exit__`
method is called, even if the block raised an exception, and can therefore run
clean-up code.

Expand All @@ -609,7 +609,7 @@ part-way through the block.
.. note::

In this case, *f* is the same object created by :func:`open`, because
:meth:`file.__enter__` returns *self*.
:meth:`~object.__enter__` returns *self*.

The :mod:`threading` module's locks and condition variables also support the
':keyword:`with`' statement::
Expand Down Expand Up @@ -652,10 +652,10 @@ underlying implementation and should keep reading.
A high-level explanation of the context management protocol is:

* The expression is evaluated and should result in an object called a "context
manager". The context manager must have :meth:`__enter__` and :meth:`__exit__`
manager". The context manager must have :meth:`~object.__enter__` and :meth:`~object.__exit__`
methods.

* The context manager's :meth:`__enter__` method is called. The value returned
* The context manager's :meth:`~object.__enter__` method is called. The value returned
is assigned to *VAR*. If no ``'as VAR'`` clause is present, the value is simply
discarded.

Expand All @@ -669,7 +669,7 @@ A high-level explanation of the context management protocol is:
if you do the author of the code containing the ':keyword:`with`' statement will
never realize anything went wrong.

* If *BLOCK* didn't raise an exception, the :meth:`__exit__` method is still
* If *BLOCK* didn't raise an exception, the :meth:`~object.__exit__` method is still
called, but *type*, *value*, and *traceback* are all ``None``.

Let's think through an example. I won't present detailed code but will only
Expand Down Expand Up @@ -703,7 +703,7 @@ rolled back if there's an exception. Here's the basic interface for
def rollback (self):
"Rolls back current transaction"

The :meth:`__enter__` method is pretty easy, having only to start a new
The :meth:`~object.__enter__` method is pretty easy, having only to start a new
transaction. For this application the resulting cursor object would be a useful
result, so the method will return it. The user can then add ``as cursor`` to
their ':keyword:`with`' statement to bind the cursor to a variable name. ::
Expand All @@ -715,7 +715,7 @@ their ':keyword:`with`' statement to bind the cursor to a variable name. ::
cursor = self.cursor()
return cursor

The :meth:`__exit__` method is the most complicated because it's where most of
The :meth:`~object.__exit__` method is the most complicated because it's where most of
the work has to be done. The method has to check if an exception occurred. If
there was no exception, the transaction is committed. The transaction is rolled
back if there was an exception.
Expand Down Expand Up @@ -748,10 +748,10 @@ are useful for writing objects for use with the ':keyword:`with`' statement.
The decorator is called :func:`contextmanager`, and lets you write a single
generator function instead of defining a new class. The generator should yield
exactly one value. The code up to the :keyword:`yield` will be executed as the
:meth:`__enter__` method, and the value yielded will be the method's return
:meth:`~object.__enter__` method, and the value yielded will be the method's return
value that will get bound to the variable in the ':keyword:`with`' statement's
:keyword:`!as` clause, if any. The code after the :keyword:`yield` will be
executed in the :meth:`__exit__` method. Any exception raised in the block will
executed in the :meth:`~object.__exit__` method. Any exception raised in the block will
be raised by the :keyword:`!yield` statement.

Our database example from the previous section could be written using this
Expand Down
26 changes: 13 additions & 13 deletions Doc/whatsnew/2.6.rst
Original file line number Diff line number Diff line change
Expand Up @@ -269,15 +269,15 @@ structure is::
with-block

The expression is evaluated, and it should result in an object that supports the
context management protocol (that is, has :meth:`__enter__` and :meth:`__exit__`
context management protocol (that is, has :meth:`~object.__enter__` and :meth:`~object.__exit__`
methods).

The object's :meth:`__enter__` is called before *with-block* is executed and
The object's :meth:`~object.__enter__` is called before *with-block* is executed and
therefore can run set-up code. It also may return a value that is bound to the
name *variable*, if given. (Note carefully that *variable* is *not* assigned
the result of *expression*.)

After execution of the *with-block* is finished, the object's :meth:`__exit__`
After execution of the *with-block* is finished, the object's :meth:`~object.__exit__`
method is called, even if the block raised an exception, and can therefore run
clean-up code.

Expand All @@ -296,7 +296,7 @@ part-way through the block.
.. note::

In this case, *f* is the same object created by :func:`open`, because
:meth:`file.__enter__` returns *self*.
:meth:`~object.__enter__` returns *self*.

The :mod:`threading` module's locks and condition variables also support the
':keyword:`with`' statement::
Expand Down Expand Up @@ -339,16 +339,16 @@ underlying implementation and should keep reading.
A high-level explanation of the context management protocol is:

* The expression is evaluated and should result in an object called a "context
manager". The context manager must have :meth:`__enter__` and :meth:`__exit__`
manager". The context manager must have :meth:`~object.__enter__` and :meth:`~object.__exit__`
methods.

* The context manager's :meth:`__enter__` method is called. The value returned
* The context manager's :meth:`~object.__enter__` method is called. The value returned
is assigned to *VAR*. If no ``as VAR`` clause is present, the value is simply
discarded.

* The code in *BLOCK* is executed.

* If *BLOCK* raises an exception, the context manager's :meth:`__exit__` method
* If *BLOCK* raises an exception, the context manager's :meth:`~object.__exit__` method
is called with three arguments, the exception details (``type, value, traceback``,
the same values returned by :func:`sys.exc_info`, which can also be ``None``
if no exception occurred). The method's return value controls whether an exception
Expand All @@ -357,7 +357,7 @@ A high-level explanation of the context management protocol is:
if you do the author of the code containing the ':keyword:`with`' statement will
never realize anything went wrong.

* If *BLOCK* didn't raise an exception, the :meth:`__exit__` method is still
* If *BLOCK* didn't raise an exception, the :meth:`~object.__exit__` method is still
called, but *type*, *value*, and *traceback* are all ``None``.

Let's think through an example. I won't present detailed code but will only
Expand Down Expand Up @@ -391,7 +391,7 @@ rolled back if there's an exception. Here's the basic interface for
def rollback(self):
"Rolls back current transaction"

The :meth:`__enter__` method is pretty easy, having only to start a new
The :meth:`~object.__enter__` method is pretty easy, having only to start a new
transaction. For this application the resulting cursor object would be a useful
result, so the method will return it. The user can then add ``as cursor`` to
their ':keyword:`with`' statement to bind the cursor to a variable name. ::
Expand All @@ -403,7 +403,7 @@ their ':keyword:`with`' statement to bind the cursor to a variable name. ::
cursor = self.cursor()
return cursor

The :meth:`__exit__` method is the most complicated because it's where most of
The :meth:`~object.__exit__` method is the most complicated because it's where most of
the work has to be done. The method has to check if an exception occurred. If
there was no exception, the transaction is committed. The transaction is rolled
back if there was an exception.
Expand Down Expand Up @@ -436,10 +436,10 @@ are useful when writing objects for use with the ':keyword:`with`' statement.
The decorator is called :func:`contextmanager`, and lets you write a single
generator function instead of defining a new class. The generator should yield
exactly one value. The code up to the :keyword:`yield` will be executed as the
:meth:`__enter__` method, and the value yielded will be the method's return
:meth:`~object.__enter__` method, and the value yielded will be the method's return
value that will get bound to the variable in the ':keyword:`with`' statement's
:keyword:`!as` clause, if any. The code after the :keyword:`!yield` will be
executed in the :meth:`__exit__` method. Any exception raised in the block will
executed in the :meth:`~object.__exit__` method. Any exception raised in the block will
be raised by the :keyword:`!yield` statement.

Using this decorator, our database example from the previous section
Expand Down Expand Up @@ -1737,7 +1737,7 @@ Optimizations
(Contributed by Antoine Pitrou.) Memory usage is reduced
by using pymalloc for the Unicode string's data.

* The ``with`` statement now stores the :meth:`__exit__` method on the stack,
* The ``with`` statement now stores the :meth:`~object.__exit__` method on the stack,
producing a small speedup. (Implemented by Jeffrey Yasskin.)

* To reduce memory usage, the garbage collector will now clear internal
Expand Down