diff -r 978b7dfcb6f1 Objects/object.c
--- a/Objects/object.c	Tue Oct 13 00:16:07 2015 +0200
+++ b/Objects/object.c	Tue Oct 13 00:33:24 2015 +0200
@@ -686,11 +686,10 @@ do_richcompare(PyObject *v, PyObject *w,
         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()",
+                     "'%s' not supported between instances of '%.100s' and '%.100s'",
+                     opstrings[op],
                      v->ob_type->tp_name,
-                     opstrings[op],
                      w->ob_type->tp_name);
         return NULL;
     }