[Python-checkins] cpython (2.7): give exception a nice message (closes #22379)
benjamin.peterson
python-checkins at python.org
Sun Sep 28 18:57:29 CEST 2014
https://hg.python.org/cpython/rev/0ad19246d16d
changeset: 92619:0ad19246d16d
branch: 2.7
parent: 92612:9ad78b4b169c
user: Benjamin Peterson <benjamin at python.org>
date: Sun Sep 28 12:48:46 2014 -0400
summary:
give exception a nice message (closes #22379)
Patch by Yongzhi Pan.
files:
Lib/test/string_tests.py | 13 ++++++-------
Lib/test/test_string.py | 11 ++++-------
Lib/test/test_userstring.py | 12 +++++-------
Misc/ACKS | 1 +
Misc/NEWS | 3 +++
Objects/stringobject.c | 2 +-
6 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py
--- a/Lib/test/string_tests.py
+++ b/Lib/test/string_tests.py
@@ -65,14 +65,12 @@
self.assertTrue(object is not realresult)
# check that object.method(*args) raises exc
- def checkraises(self, exc, object, methodname, *args):
- object = self.fixtype(object)
+ def checkraises(self, exc, obj, methodname, *args):
+ obj = self.fixtype(obj)
args = self.fixtype(args)
- self.assertRaises(
- exc,
- getattr(object, methodname),
- *args
- )
+ with self.assertRaises(exc) as cm:
+ getattr(obj, methodname)(*args)
+ self.assertNotEqual(cm.exception.message, '')
# call object.method(*args) without any checks
def checkcall(self, object, methodname, *args):
@@ -1057,6 +1055,7 @@
self.checkequal('a b c', ' ', 'join', BadSeq2())
self.checkraises(TypeError, ' ', 'join')
+ self.checkraises(TypeError, ' ', 'join', None)
self.checkraises(TypeError, ' ', 'join', 7)
self.checkraises(TypeError, ' ', 'join', Sequence([7, 'hello', 123L]))
try:
diff --git a/Lib/test/test_string.py b/Lib/test/test_string.py
--- a/Lib/test/test_string.py
+++ b/Lib/test/test_string.py
@@ -16,13 +16,10 @@
realresult
)
- def checkraises(self, exc, object, methodname, *args):
- self.assertRaises(
- exc,
- getattr(string, methodname),
- object,
- *args
- )
+ def checkraises(self, exc, obj, methodname, *args):
+ with self.assertRaises(exc) as cm:
+ getattr(string, methodname)(obj, *args)
+ self.assertNotEqual(cm.exception.message, '')
def checkcall(self, object, methodname, *args):
getattr(string, methodname)(object, *args)
diff --git a/Lib/test/test_userstring.py b/Lib/test/test_userstring.py
--- a/Lib/test/test_userstring.py
+++ b/Lib/test/test_userstring.py
@@ -28,14 +28,12 @@
realresult
)
- def checkraises(self, exc, object, methodname, *args):
- object = self.fixtype(object)
+ def checkraises(self, exc, obj, methodname, *args):
+ obj = self.fixtype(obj)
# we don't fix the arguments, because UserString can't cope with it
- self.assertRaises(
- exc,
- getattr(object, methodname),
- *args
- )
+ with self.assertRaises(exc) as cm:
+ getattr(obj, methodname)(*args)
+ self.assertNotEqual(cm.exception.message, '')
def checkcall(self, object, methodname, *args):
object = self.fixtype(object)
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1007,6 +1007,7 @@
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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,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.
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -1594,7 +1594,7 @@
Py_ssize_t i;
PyObject *seq, *item;
- seq = PySequence_Fast(orig, "");
+ seq = PySequence_Fast(orig, "can only join an iterable");
if (seq == NULL) {
return NULL;
}
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list