summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorYury Selivanov <yury@magic.io>2016-11-07 21:07:30 (GMT)
committerYury Selivanov <yury@magic.io>2016-11-07 21:07:30 (GMT)
commit6130c0271f00e54fe754f764733668ecda617d51 (patch)
tree17a45b0e168e91690e48095e8844bf284f814aef /Misc
parent91aa5c12ea1efe9a7bba57d0d4d31a2a182d4fcd (diff)
parent49d6b8c0c3124e94728dd44aafc33becfb14415b (diff)
downloadcpython-6130c0271f00e54fe754f764733668ecda617d51.zip
cpython-6130c0271f00e54fe754f764733668ecda617d51.tar.gz
cpython-6130c0271f00e54fe754f764733668ecda617d51.tar.bz2
Merge 3.5 (issue #28634)
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS2
1 files changed, 2 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 47acb52..bceacc8 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -25,6 +25,8 @@ Library
- Issue #28613: Fix get_event_loop() return the current loop if
called from coroutines/callbacks.
+- Issue #28634: Fix asyncio.isfuture() to support unittest.Mock.
+
Documentation
-------------