bpo-33299: Return an object itself for some types in _PyCode_ConstantKey(). (GH-6513)
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index 0509b8e..aa373a0 100644
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -488,14 +488,21 @@
{
PyObject *key;
- /* Py_None and Py_Ellipsis are singleton */
+ /* Py_None and Py_Ellipsis are singletons. */
if (op == Py_None || op == Py_Ellipsis
|| PyLong_CheckExact(op)
- || PyBool_Check(op)
- || PyBytes_CheckExact(op)
|| PyUnicode_CheckExact(op)
/* code_richcompare() uses _PyCode_ConstantKey() internally */
- || PyCode_Check(op)) {
+ || PyCode_Check(op))
+ {
+ /* Objects of these types are always different from object of other
+ * type and from tuples. */
+ Py_INCREF(op);
+ key = op;
+ }
+ else if (PyBool_Check(op) || PyBytes_CheckExact(op)) {
+ /* Make booleans different from integers 0 and 1.
+ * Avoid BytesWarning from comparing bytes with strings. */
key = PyTuple_Pack(2, Py_TYPE(op), op);
}
else if (PyFloat_CheckExact(op)) {