diff options
author | Martin Panter <vadmium+py@gmail.com> | 2017-01-29 10:16:28 +0000 |
---|---|---|
committer | Martin Panter <vadmium+py@gmail.com> | 2017-01-29 10:16:28 +0000 |
commit | 23352add84278fc0476b2d6599489fbb70c9f5bc (patch) | |
tree | 600bf5132e46d31b69efbd3bbc8a3d37159c0744 /Modules/_struct.c | |
parent | 6d1d733828b49eb03d45da81c6b8c6b849fbc5df (diff) | |
parent | 0fb1e3c9fc84c62a91f1e5889dc8e0855cefa4ae (diff) | |
download | cpython-23352add84278fc0476b2d6599489fbb70c9f5bc.tar.gz |
Issues #29349: Merge Py 2 fix 3.6
Diffstat (limited to 'Modules/_struct.c')
-rw-r--r-- | Modules/_struct.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Modules/_struct.c b/Modules/_struct.c index 796d1682f0..d621789d6b 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1650,7 +1650,7 @@ unpackiter_iternext(unpackiterobject *self) } static PyTypeObject unpackiter_type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + PyVarObject_HEAD_INIT(NULL, 0) "unpack_iterator", /* tp_name */ sizeof(unpackiterobject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -2048,7 +2048,7 @@ cache_struct(PyObject *fmt) s_object = PyObject_CallFunctionObjArgs((PyObject *)(&PyStructType), fmt, NULL); if (s_object != NULL) { - if (PyDict_Size(cache) >= MAXCACHE) + if (PyDict_GET_SIZE(cache) >= MAXCACHE) PyDict_Clear(cache); /* Attempt to cache the result */ if (PyDict_SetItem(cache, fmt, s_object) == -1) @@ -2301,6 +2301,9 @@ PyInit__struct(void) if (PyType_Ready(&PyStructType) < 0) return NULL; + if (PyType_Ready(&unpackiter_type) < 0) + return NULL; + /* Check endian and swap in faster functions */ { const formatdef *native = native_table; |