summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-09-28 16:48:46 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-09-28 16:48:46 (GMT)
commit1643d5cb08b72cb4f589ddd38db059412a4dcdd1 (patch)
tree8fb181a9a0a9205c4f4850917ac9ab7b1685264b /Misc
parent9ad23c6c315d09bef659a12a9f7f7123c707ea41 (diff)
downloadcpython-1643d5cb08b72cb4f589ddd38db059412a4dcdd1.zip
cpython-1643d5cb08b72cb4f589ddd38db059412a4dcdd1.tar.gz
cpython-1643d5cb08b72cb4f589ddd38db059412a4dcdd1.tar.bz2
give exception a nice message (closes #22379)
Patch by Yongzhi Pan.
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 3fb951c..fad0d88 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1007,6 +1007,7 @@ Mike Pall
Todd R. Palmer
Juan David Ibáñez Palomar
Jan Palus
+Yongzhi Pan
Mathias Panzenböck
M. Papillon
Peter Parente
diff --git a/Misc/NEWS b/Misc/NEWS
index da2c554..237da41 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 2.7.9?
Core and Builtins
-----------------
+- Issue #22379: Fix empty exception message in a TypeError raised in
+ ``str.join``.
+
- Issue #22221: Now the source encoding declaration on the second line isn't
effective if the first line contains anything except a comment.