From: Mark Dickinson <dickinsm@gmail.com>
Date: Sat, 24 Sep 2016 14:28:34 +0000 (+0100)
Subject: Issue #28203: Merge from 3.5
X-Git-Tag: v3.6.0b2~126
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6997946ec45378b3e9aa7d2f8c500bbcb9821739;p=python

Issue #28203: Merge from 3.5
---

6997946ec45378b3e9aa7d2f8c500bbcb9821739
diff --cc Misc/NEWS
index db822155a5,8c9dcc3696..e9b22be114
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,11 -10,8 +10,14 @@@ What's New in Python 3.6.0 beta 
  Core and Builtins
  -----------------
  
 -- Issue #28203: Fix incorrect type in error message from
 -  ``complex(1.0, {2:3})``. Patch by Soumya Sharma.
++- Issue #28203: Fix incorrect type in complex(1.0, {2:3}) error message.
++  Patch by Soumya Sharma.
++
 +- Issue #28086: Single var-positional argument of tuple subtype was passed
 +  unscathed to the C-defined function.  Now it is converted to exact tuple.
 +
 +- Issue #28214: Now __set_name__ is looked up on the class instead of the
 +  instance.
  
  - Issue #27955: Fallback on reading /dev/urandom device when the getrandom()
    syscall fails with EPERM, for example when blocked by SECCOMP.