From: Berker Peksag <berker.peksag@gmail.com>
Date: Sat, 4 Feb 2017 06:34:48 +0000 (+0300)
Subject: Issue #29198: Merge from 3.5
X-Git-Tag: v3.6.1rc1~116
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a001eea5b9da4f2bd099f3156ba75903c9b949d;p=thirdparty%2FPython%2Fcpython.git

Issue #29198: Merge from 3.5
---

5a001eea5b9da4f2bd099f3156ba75903c9b949d
diff --cc Doc/library/typing.rst
index 6c4af4c90cdf,8da71b64a792..6c8982ba7435
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@@ -638,14 -625,8 +638,14 @@@ The module defines the following classe
  
  .. class:: AsyncIterator(AsyncIterable[T_co])
  
-   A generic version of :class:`collections.abc.AsyncIterator`.
+    A generic version of :class:`collections.abc.AsyncIterator`.
  
 +.. class:: ContextManager(Generic[T_co])
 +
 +   A generic version of :class:`contextlib.AbstractContextManager`.
 +
 +   .. versionadded:: 3.6
 +
  .. class:: Dict(dict, MutableMapping[KT, VT])
  
     A generic version of :class:`dict`.