diff --git a/Doc/library/contextlib.rst b/Doc/library/contextlib.rst
@@ -80,6 +80,36 @@ Functions and classes provided:
      Use of :class:`ContextDecorator`.


.. function:: closing(thing)

   Return a context manager that closes *thing* upon completion of the block.  This

diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
@@ -2575,6 +2575,8 @@ An example of an asynchronous iterable object::
      result in a :exc:`RuntimeError`.


Asynchronous Context Managers
-----------------------------


diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
@@ -95,6 +95,12 @@ New Modules
Improved Modules
================

distutils
---------


diff --git a/Lib/contextlib.py b/Lib/contextlib.py
@@ -4,9 +4,9 @@
from collections import deque
from functools import wraps

-__all__ = ["contextmanager", "closing", "AbstractContextManager",
-           "ContextDecorator", "ExitStack", "redirect_stdout",
-           "redirect_stderr", "suppress"]


class AbstractContextManager(abc.ABC):
@@ -54,8 +54,8 @@ def inner(*args, **kwds):
        return inner


-class _GeneratorContextManager(ContextDecorator, AbstractContextManager):
-    """Helper for @contextmanager decorator."""

    def __init__(self, func, args, kwds):
        self.gen = func(*args, **kwds)
@@ -71,6 +71,12 @@ def __init__(self, func, args, kwds):
        # for the class instead.
        # See http://bugs.python.org/issue19404 for more details.

    def _recreate_cm(self):
        # _GCM instances are one-shot context managers, so the
        # CM must be recreated each time a decorated function is
@@ -121,12 +127,61 @@ def __exit__(self, type, value, traceback):
                # fixes the impedance mismatch between the throw() protocol
                # and the __exit__() protocol.
                #
                if sys.exc_info()[1] is value:
                    return False
                raise
            raise RuntimeError("generator didn't stop after throw()")


def contextmanager(func):
    """@contextmanager decorator.

@@ -153,14 +208,46 @@ def some_generator(<arguments>):
            <body>
        finally:
            <cleanup>
-
    """
    @wraps(func)
    def helper(*args, **kwds):
        return _GeneratorContextManager(func, args, kwds)
    return helper


class closing(AbstractContextManager):
    """Context to automatically close something at the end of a block.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -80,6 +80,36 @@ Functions and classes provided:
		Use of :class:`ContextDecorator`.


		.. function:: closing(thing)

		Return a context manager that closes thing upon completion of the block. This
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2575,6 +2575,8 @@ An example of an asynchronous iterable object::
		result in a :exc:`RuntimeError`.


		Asynchronous Context Managers
		-----------------------------

Expand Down
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,6 +95,12 @@ New Modules @@
     Improved Modules
     ================
     distutils
     ---------
@@ Expand Down @@