]> granicus.if.org Git - python/commitdiff
Merge 3.5 (issue #27392)
authorYury Selivanov <yury@magic.io>
Tue, 12 Jul 2016 22:24:25 +0000 (18:24 -0400)
committerYury Selivanov <yury@magic.io>
Tue, 12 Jul 2016 22:24:25 +0000 (18:24 -0400)
1  2 
Lib/asyncio/base_events.py
Misc/NEWS

Simple merge
diff --cc Misc/NEWS
index 1f992ef16b2a9dc020a2c69d09870eec1c3d0995,3b7411cdf71c37d3aab542ed69997933537865d6..b9bd9496d5355261609470eba54816c37163deec
+++ b/Misc/NEWS
@@@ -128,6 -70,11 +128,9 @@@ Librar
    locale encoding, and fix get_begidx() and get_endidx() to return code point
    indexes.
  
 -- Issue #26930: Update Windows builds to use OpenSSL 1.0.2h.
 -
+ - Issue #27392: Add loop.connect_accepted_socket().
+   Patch by Jim Fulton.
  IDLE
  ----