diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2015-12-21 14:17:12 -0600 |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2015-12-21 14:17:12 -0600 |
| commit | f2b234443c53cb73dc749da57d952286437cb15a (patch) | |
| tree | f21b8b25f5bfbe76a2c85ae62f6d06060dd03372 /Objects/object.c | |
| parent | 26b842a82d9ae7d30c692080bf352a0ef78a626c (diff) | |
| parent | 977fd6d7c6593680fd5ffdebb262a2a3f2f24387 (diff) | |
| download | cpython-f2b234443c53cb73dc749da57d952286437cb15a.tar.gz | |
Issue #25827: Merge with 3.5
Diffstat (limited to 'Objects/object.c')
| -rw-r--r-- | Objects/object.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Objects/object.c b/Objects/object.c index 6fc4df1639..e1718eafcd 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -686,11 +686,10 @@ do_richcompare(PyObject *v, PyObject *w, int op) res = (v != w) ? Py_True : Py_False; break; default: - /* XXX Special-case None so it doesn't show as NoneType() */ PyErr_Format(PyExc_TypeError, - "unorderable types: %.100s() %s %.100s()", - v->ob_type->tp_name, + "'%s' not supported between instances of '%.100s' and '%.100s'", opstrings[op], + v->ob_type->tp_name, w->ob_type->tp_name); return NULL; } |