summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2016-09-24 14:28:34 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2016-09-24 14:28:34 (GMT)
commit6997946ec45378b3e9aa7d2f8c500bbcb9821739 (patch)
tree1ef91b27c2f770d9aabd4c650afc75534120c40a /Misc
parent938da643ee4ad16a4cca65e0badd6d315feaed4f (diff)
parent613f8e513cf171a335318221b6050d470a1d765f (diff)
downloadcpython-6997946ec45378b3e9aa7d2f8c500bbcb9821739.zip
cpython-6997946ec45378b3e9aa7d2f8c500bbcb9821739.tar.gz
cpython-6997946ec45378b3e9aa7d2f8c500bbcb9821739.tar.bz2
Issue #28203: Merge from 3.5
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 7ceee35..34d2fd3 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1369,6 +1369,7 @@ Daniel Shahaf
Mark Shannon
Ha Shao
Richard Shapiro
+Soumya Sharma
Varun Sharma
Daniel Shaulov
Vlad Shcherbina
diff --git a/Misc/NEWS b/Misc/NEWS
index db82215..e9b22be 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.6.0 beta 2
Core and Builtins
-----------------
+- 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.