From: Victor Stinner <victor.stinner@gmail.com>
Date: Mon, 7 Apr 2014 09:20:22 +0000 (+0200)
Subject: (Merge 3.4) Issue #21155: asyncio.EventLoop.create_unix_server() now raises a
X-Git-Tag: v3.5.0a1~1934
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b2262fe78b3dff8c986d0bfe942a4defbd973f0;p=thirdparty%2FPython%2Fcpython.git

(Merge 3.4) Issue #21155: asyncio.EventLoop.create_unix_server() now raises a
ValueError if path and sock are specified at the same time. asyncio: Document
Task.cancel() properly.
---

7b2262fe78b3dff8c986d0bfe942a4defbd973f0
diff --cc Misc/NEWS
index 3bc36a9b5b18,ec4ea5cd4ec6..a27eb51074e2
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -29,19 -27,9 +29,22 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #21155: asyncio.EventLoop.create_unix_server() now raises a ValueError
+   if path and sock are specified at the same time.
+ 
 +- Issue #21136: Avoid unnecessary normalization of Fractions resulting from
 +  power and other operations.  Patch by Raymond Hettinger.
 +
 +- Issue #17621: Introduce importlib.util.LazyLoader.
 +
 +- Issue #21076: signal module constants were turned into enums.
 +  Patch by Giampaolo Rodola'.
 +
 +- Issue #20636: Improved the repr of Tkinter widgets.
 +
 +- Issue #19505: The items, keys, and values views of OrderedDict now support
 +  reverse iteration using reversed().
 +
  - Issue #21149: Improved thread-safety in logging cleanup during interpreter
    shutdown. Thanks to Devin Jeanpierre for the patch.