changeset:   96729:800bf6a0e0d5
parent:      96727:5d43f103f66b
parent:      96728:e20c197f19d6
user:        Yury Selivanov <yselivanov@sprymix.com>
date:        Tue Jun 30 18:19:18 2015 -0400
files:       Doc/whatsnew/3.5.rst
description:
Merge 3.5 (Issue #24400)


diff -r 5d43f103f66b -r 800bf6a0e0d5 Doc/library/inspect.rst
--- a/Doc/library/inspect.rst	Tue Jun 30 12:51:29 2015 -0400
+++ b/Doc/library/inspect.rst	Tue Jun 30 18:19:18 2015 -0400
@@ -303,16 +303,6 @@
    .. versionadded:: 3.5
 
 
-.. function:: isawaitable(object)
-
-   Return true if the object can be used in :keyword:`await`
-   expression.
-
-   See also :class:`collections.abc.Awaitable`.
-
-   .. versionadded:: 3.5
-
-
 .. function:: istraceback(object)
 
    Return true if the object is a traceback.
diff -r 5d43f103f66b -r 800bf6a0e0d5 Doc/whatsnew/3.5.rst
--- a/Doc/whatsnew/3.5.rst	Tue Jun 30 12:51:29 2015 -0400
+++ b/Doc/whatsnew/3.5.rst	Tue Jun 30 18:19:18 2015 -0400
@@ -527,9 +527,8 @@
 * New argument ``follow_wrapped`` for :func:`inspect.signature`.
   (Contributed by Yury Selivanov in :issue:`20691`.)
 
-* New :func:`~inspect.iscoroutine`, :func:`~inspect.iscoroutinefunction`,
-  and :func:`~inspect.isawaitable` functions.  (Contributed by Yury Selivanov
-  in :issue:`24017`.)
+* New :func:`~inspect.iscoroutine` and :func:`~inspect.iscoroutinefunction`
+  functions.  (Contributed by Yury Selivanov in :issue:`24017`.)
 
 * New :func:`~inspect.getcoroutinelocals` and :func:`~inspect.getcoroutinestate`
   functions.  (Contributed by Yury Selivanov in :issue:`24400`.)
diff -r 5d43f103f66b -r 800bf6a0e0d5 Lib/inspect.py
--- a/Lib/inspect.py	Tue Jun 30 12:51:29 2015 -0400
+++ b/Lib/inspect.py	Tue Jun 30 18:19:18 2015 -0400
@@ -186,10 +186,6 @@
     return bool((isfunction(object) or ismethod(object)) and
                 object.__code__.co_flags & CO_COROUTINE)
 
-def isawaitable(object):
-    """Return true if the object can be used in "await" expression."""
-    return isinstance(object, collections.abc.Awaitable)
-
 def isgenerator(object):
     """Return true if the object is a generator.
 
diff -r 5d43f103f66b -r 800bf6a0e0d5 Lib/test/test_inspect.py
--- a/Lib/test/test_inspect.py	Tue Jun 30 12:51:29 2015 -0400
+++ b/Lib/test/test_inspect.py	Tue Jun 30 18:19:18 2015 -0400
@@ -159,31 +159,6 @@
 
         coro.close(); gen_coro.close() # silence warnings
 
-    def test_isawaitable(self):
-        def gen(): yield
-        self.assertFalse(inspect.isawaitable(gen()))
-
-        coro = coroutine_function_example(1)
-        gen_coro = gen_coroutine_function_example(1)
-
-        self.assertTrue(
-            inspect.isawaitable(coro))
-        self.assertTrue(
-            inspect.isawaitable(gen_coro))
-
-        class Future:
-            def __await__():
-                pass
-        self.assertTrue(inspect.isawaitable(Future()))
-        self.assertFalse(inspect.isawaitable(Future))
-
-        class NotFuture: pass
-        not_fut = NotFuture()
-        not_fut.__await__ = lambda: None
-        self.assertFalse(inspect.isawaitable(not_fut))
-
-        coro.close(); gen_coro.close() # silence warnings
-
     def test_isroutine(self):
         self.assertTrue(inspect.isroutine(mod.spam))
         self.assertTrue(inspect.isroutine([].count))