From b7e1eff8436f6e0c4aac440036092fcf96f82960 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Thu, 19 Apr 2018 08:28:04 +0300 Subject: bpo-33299: Return an object itself for some types in _PyCode_ConstantKey(). (GH-6513) --- Objects/codeobject.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'Objects/codeobject.c') diff --git a/Objects/codeobject.c b/Objects/codeobject.c index 0509b8e640..aa373a075d 100644 --- a/Objects/codeobject.c +++ b/Objects/codeobject.c @@ -488,14 +488,21 @@ _PyCode_ConstantKey(PyObject *op) { 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)) { -- cgit v1.2.1