mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Issue #29337: Fixed possible BytesWarning when compare the code objects.

Browse source 
Warnings could be emitted at compile time.
This commit is contained in:
Serhiy Storchaka 2017-01-24 20:49:26 +02:00
parent ef107ee7a0
commit 713640c4c9
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/test/test_compile.py
View file

@ -634,6 +634,7 @@ if 1:
f1 = ns['f1'] f1 = ns['f1']
f2 = ns['f2'] f2 = ns['f2']
self.assertIsNot(f1.__code__, f2.__code__) self.assertIsNot(f1.__code__, f2.__code__)
self.assertNotEqual(f1.__code__, f2.__code__)
self.check_constant(f1, const1) self.check_constant(f1, const1)
self.check_constant(f2, const2) self.check_constant(f2, const2)
self.assertEqual(repr(f1()), repr(const1)) self.assertEqual(repr(f1()), repr(const1))
@ -642,6 +643,8 @@ if 1:
check_different_constants(0, 0.0) check_different_constants(0, 0.0)
check_different_constants(+0.0, -0.0) check_different_constants(+0.0, -0.0)
check_different_constants((0,), (0.0,)) check_different_constants((0,), (0.0,))
check_different_constants('a', b'a')
check_different_constants(('a',), (b'a',))
# check_different_constants() cannot be used because repr(-0j) is # check_different_constants() cannot be used because repr(-0j) is
# '(-0-0j)', but when '(-0-0j)' is evaluated to 0j: we loose the sign. # '(-0-0j)', but when '(-0-0j)' is evaluated to 0j: we loose the sign.

3
Misc/NEWS
View file

@ -10,6 +10,9 @@ Release date: XXXX-XX-XX
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #29337: Fixed possible BytesWarning when compare the code objects.
Warnings could be emitted at compile time.
Library Library
------- -------

6
Objects/codeobject.c
View file

@ -521,7 +521,7 @@ _PyCode_ConstantKey(PyObject *op)
PyTuple_SET_ITEM(tuple, i, item_key); PyTuple_SET_ITEM(tuple, i, item_key);
} }
key = PyTuple_Pack(3, Py_TYPE(op), op, tuple); key = PyTuple_Pack(2, tuple, op);
Py_DECREF(tuple); Py_DECREF(tuple);
} }
else if (PyFrozenSet_CheckExact(op)) { else if (PyFrozenSet_CheckExact(op)) {
@ -555,7 +555,7 @@ _PyCode_ConstantKey(PyObject *op)
if (set == NULL) if (set == NULL)
return NULL; return NULL;
key = PyTuple_Pack(3, Py_TYPE(op), op, set); key = PyTuple_Pack(2, set, op);
Py_DECREF(set); Py_DECREF(set);
return key; return key;
} }
@ -566,7 +566,7 @@ _PyCode_ConstantKey(PyObject *op)
if (obj_id == NULL) if (obj_id == NULL)
return NULL; return NULL;
key = PyTuple_Pack(3, Py_TYPE(op), op, obj_id); key = PyTuple_Pack(2, obj_id, op);
Py_DECREF(obj_id); Py_DECREF(obj_id);
} }
return key; return key;