summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYury Selivanov <yury@magic.io>2016-06-08 17:58:35 (GMT)
committerYury Selivanov <yury@magic.io>2016-06-08 17:58:35 (GMT)
commit1842e12b0b14ab49a83c66b82b7017c95ef20131 (patch)
tree7a19e75e13defc89858bc974c16f889723d1f8ee
parent7a713386d84854f72731f178f1bdacc0575cd422 (diff)
parent07a9fcdc86b740ac5c5108d10418e7668a06e3df (diff)
downloadcpython-1842e12b0b14ab49a83c66b82b7017c95ef20131.zip
cpython-1842e12b0b14ab49a83c66b82b7017c95ef20131.tar.gz
cpython-1842e12b0b14ab49a83c66b82b7017c95ef20131.tar.bz2
Merge 3.5 (NEWS)
-rw-r--r--Misc/NEWS2
1 files changed, 0 insertions, 2 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 6f71c26..624c6ed 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1158,8 +1158,6 @@ Library
- Skip getaddrinfo if host is already resolved.
Patch by A. Jesse Jiryu Davis.
-- Add asyncio.timeout() context manager.
-
- Issue #26050: Add asyncio.StreamReader.readuntil() method.
Patch by Марк Коренберг.