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

serhiy-storchaka · serhiy-storchaka · commit 4102d25b7eef · 2017-01-24T20:52:43.000+02:00
Warnings could be emitted at compile time.
diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
@@ -637,6 +637,7 @@ def check_different_constants(const1, const2):
             f1 = ns['f1']
             f2 = ns['f2']
             self.assertIsNot(f1.__code__, f2.__code__)
+            self.assertNotEqual(f1.__code__, f2.__code__)
             self.check_constant(f1, const1)
             self.check_constant(f2, const2)
             self.assertEqual(repr(f1()), repr(const1))
@@ -645,6 +646,8 @@ def check_different_constants(const1, const2):
         check_different_constants(0, 0.0)
         check_different_constants(+0.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
         # '(-0-0j)', but when '(-0-0j)' is evaluated to 0j: we loose the sign.
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.6.1 release candidate 1?
 Core and Builtins
 -----------------
 
+- Issue #29337: Fixed possible BytesWarning when compare the code objects.
+  Warnings could be emitted at compile time.
+
 - Issue #29327: Fixed a crash when pass the iterable keyword argument to
   sorted().
 
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
@@ -545,7 +545,7 @@ _PyCode_ConstantKey(PyObject *op)
             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);
     }
     else if (PyFrozenSet_CheckExact(op)) {
@@ -579,7 +579,7 @@ _PyCode_ConstantKey(PyObject *op)
         if (set == NULL)
             return NULL;
 
-        key = PyTuple_Pack(3, Py_TYPE(op), op, set);
+        key = PyTuple_Pack(2, set, op);
         Py_DECREF(set);
         return key;
     }
@@ -590,7 +590,7 @@ _PyCode_ConstantKey(PyObject *op)
         if (obj_id == NULL)
             return NULL;
 
-        key = PyTuple_Pack(3, Py_TYPE(op), op, obj_id);
+        key = PyTuple_Pack(2, obj_id, op);
         Py_DECREF(obj_id);
     }
     return key;

Original file line number	Diff line number	Diff line change
`@@ -545,7 +545,7 @@ _PyCode_ConstantKey(PyObject *op)`
`545`	`545`	`PyTuple_SET_ITEM(tuple, i, item_key);`
`546`	`546`	`}`
`547`	`547`
`548`		`- key = PyTuple_Pack(3, Py_TYPE(op), op, tuple);`
	`548`	`+ key = PyTuple_Pack(2, tuple, op);`
`549`	`549`	`Py_DECREF(tuple);`
`550`	`550`	`}`
`551`	`551`	`else if (PyFrozenSet_CheckExact(op)) {`
`@@ -579,7 +579,7 @@ _PyCode_ConstantKey(PyObject *op)`
`579`	`579`	`if (set == NULL)`
`580`	`580`	`return NULL;`
`581`	`581`
`582`		`- key = PyTuple_Pack(3, Py_TYPE(op), op, set);`
	`582`	`+ key = PyTuple_Pack(2, set, op);`
`583`	`583`	`Py_DECREF(set);`
`584`	`584`	`return key;`
`585`	`585`	`}`
`@@ -590,7 +590,7 @@ _PyCode_ConstantKey(PyObject *op)`
`590`	`590`	`if (obj_id == NULL)`
`591`	`591`	`return NULL;`
`592`	`592`
`593`		`- key = PyTuple_Pack(3, Py_TYPE(op), op, obj_id);`
	`593`	`+ key = PyTuple_Pack(2, obj_id, op);`
`594`	`594`	`Py_DECREF(obj_id);`
`595`	`595`	`}`
`596`	`596`	`return key;`