Skip to content

Commit 911391a

Browse files
author
Marco Sulla
committed
aligned 3.9 to 3.8
1 parent c981f9a commit 911391a

File tree

2 files changed

+63
-42
lines changed

2 files changed

+63
-42
lines changed

‎frozendict/src/3_8/Include/frozendictobject.h‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ extern "C" {
55
#endif
66

77
// PyAPI_DATA(PyTypeObject) PyFrozenDict_Type;
8-
PyTypeObject PyFrozenDict_Type;
8+
static PyTypeObject PyFrozenDict_Type;
99
// PyAPI_DATA(PyTypeObject) PyCoold_Type;
10-
PyTypeObject PyCoold_Type;
10+
static PyTypeObject PyCoold_Type;
11+
1112
#define PyFrozenDict_Check(op) \
1213
( \
1314
Py_IS_TYPE(op, &PyFrozenDict_Type) \
@@ -46,18 +47,18 @@ PyTypeObject PyCoold_Type;
4647
)
4748

4849
// PyAPI_DATA(PyTypeObject) PyFrozenDictIterKey_Type;
49-
PyTypeObject PyFrozenDictIterKey_Type;
50+
static PyTypeObject PyFrozenDictIterKey_Type;
5051
// PyAPI_DATA(PyTypeObject) PyFrozenDictIterValues_Type;
51-
PyTypeObject PyFrozenDictIterValues_Type;
52-
// PyAPI_DATA(PyTypeObject) PyFrozenDictIterItems_Type;
53-
PyTypeObject PyFrozenDictIterItems_Type;
52+
static PyTypeObject PyFrozenDictIterValue_Type;
53+
// PyAPI_DATA(PyTypeObject) PyFrozenDictIterItem_Type;
54+
static PyTypeObject PyFrozenDictIterItem_Type;
5455

5556
// PyAPI_DATA(PyTypeObject) PyFrozenDictKeys_Type;
56-
PyTypeObject PyFrozenDictKeys_Type;
57+
static PyTypeObject PyFrozenDictKeys_Type;
5758
// PyAPI_DATA(PyTypeObject) PyFrozenDictValues_Type;
58-
PyTypeObject PyFrozenDictValues_Type;
59+
static PyTypeObject PyFrozenDictValues_Type;
5960
// PyAPI_DATA(PyTypeObject) PyFrozenDictItems_Type;
60-
PyTypeObject PyFrozenDictItems_Type;
61+
static PyTypeObject PyFrozenDictItems_Type;
6162

6263
#define PyAnyDictKeys_Check(op) (PyDictKeys_Check(op) || PyObject_TypeCheck(op, &PyFrozenDictKeys_Type))
6364
#define PyAnyDictValues_Check(op) (PyDictValues_Check(op) || PyObject_TypeCheck(op, &PyFrozenDictValues_Type))
@@ -66,11 +67,6 @@ PyTypeObject PyFrozenDictItems_Type;
6667
# define PyAnyDictViewSet_Check(op) \
6768
(PyAnyDictKeys_Check(op) || PyAnyDictItems_Check(op))
6869

69-
// PyAPI_DATA(PyTypeObject) PyFrozenDictIterKey_Type;
70-
PyTypeObject PyFrozenDictIterKey_Type;
71-
// PyAPI_DATA(PyTypeObject) PyFrozenDictIterItem_Type;
72-
PyTypeObject PyFrozenDictIterItem_Type;
73-
7470
#ifndef Py_LIMITED_API
7571
# define Py_CPYTHON_FROZENDICTOBJECT_H
7672
# include "cpython/frozendictobject.h"

‎frozendict/src/3_8/frozendictobject.c‎

Lines changed: 53 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#include "frozendictobject.h"
33
static int frozendict_next(PyObject *op, Py_ssize_t *ppos, PyObject **pkey, PyObject **pvalue);
44
static PyObject* frozendict_iter(PyDictObject *dict);
5-
PyTypeObject PyFrozenDictIterItem_Type;
65
static int frozendict_equal(PyDictObject* a, PyDictObject* b);
76
#include "other.c"
87
#include "dictobject.c"
@@ -168,17 +167,17 @@ static int frozendict_setitem(PyObject *op,
168167
return frozendict_insert((PyDictObject*) op, key, hash, value, empty);
169168
}
170169

171-
int _PyFrozendict_SetItem(PyObject *op,
172-
PyObject *key,
173-
PyObject *value,
174-
int empty) {
175-
if (! PyAnyFrozenDict_Check(op)) {
176-
PyErr_BadInternalCall();
177-
return -1;
178-
}
170+
// int _PyFrozendict_SetItem(PyObject *op,
171+
// PyObject *key,
172+
// PyObject *value,
173+
// int empty) {
174+
// if (! PyAnyFrozenDict_Check(op)) {
175+
// PyErr_BadInternalCall();
176+
// return -1;
177+
// }
179178

180-
return frozendict_setitem(op, key, value, empty);
181-
}
179+
// return frozendict_setitem(op, key, value, empty);
180+
// }
182181

183182
/* Internal version of frozendict_next that returns a hash value in addition
184183
* to the key and value.
@@ -1346,7 +1345,7 @@ COOLD_CLASS_NAME "(iterable) -> returns an immutable dictionary, equivalent to:\
13461345
COOLD_CLASS_NAME "(**kwargs) -> returns an immutable dictionary initialized with the name=value pairs\n"
13471346
" in the keyword argument list. For example: " COOLD_CLASS_NAME "(one=1, two=2)");
13481347

1349-
PyTypeObject PyFrozenDict_Type = {
1348+
static PyTypeObject PyFrozenDict_Type = {
13501349
PyVarObject_HEAD_INIT(NULL, 0)
13511350
"frozendict." FROZENDICT_CLASS_NAME, /* tp_name */
13521351
sizeof(PyFrozenDictObject), /* tp_basicsize */
@@ -1390,7 +1389,7 @@ PyTypeObject PyFrozenDict_Type = {
13901389
.tp_vectorcall = frozendict_vectorcall,
13911390
};
13921391

1393-
PyTypeObject PyCoold_Type = {
1392+
static PyTypeObject PyCoold_Type = {
13941393
PyVarObject_HEAD_INIT(NULL, 0)
13951394
"frozendict." COOLD_CLASS_NAME, /* tp_name */
13961395
sizeof(PyFrozenDictObject), /* tp_basicsize */
@@ -1459,10 +1458,10 @@ static PyObject* frozendictiter_iternextkey(dictiterobject* di) {
14591458
return key;
14601459
}
14611460

1462-
PyTypeObject PyFrozenDictIterKey_Type = {
1461+
static PyTypeObject PyFrozenDictIterKey_Type = {
14631462
PyVarObject_HEAD_INIT(NULL, 0)
1464-
"frozendict_keyiterator", /* tp_name */
1465-
sizeof(dictiterobject), /* tp_basicsize */
1463+
"frozendict.keyiterator", /* tp_name */
1464+
sizeof(dictiterobject), /* tp_basicsize */
14661465
0, /* tp_itemsize */
14671466
/* methods */
14681467
(destructor)dictiter_dealloc, /* tp_dealloc */
@@ -1511,9 +1510,9 @@ static PyObject* frozendictiter_iternextvalue(dictiterobject* di) {
15111510
return val;
15121511
}
15131512

1514-
PyTypeObject PyFrozenDictIterValue_Type = {
1513+
static PyTypeObject PyFrozenDictIterValue_Type = {
15151514
PyVarObject_HEAD_INIT(NULL, 0)
1516-
"frozendict_valueiterator", /* tp_name */
1515+
"frozendict.valueiterator", /* tp_name */
15171516
sizeof(dictiterobject), /* tp_basicsize */
15181517
0, /* tp_itemsize */
15191518
/* methods */
@@ -1588,9 +1587,9 @@ static PyObject* frozendictiter_iternextitem(dictiterobject* di) {
15881587
return result;
15891588
}
15901589

1591-
PyTypeObject PyFrozenDictIterItem_Type = {
1590+
static PyTypeObject PyFrozenDictIterItem_Type = {
15921591
PyVarObject_HEAD_INIT(NULL, 0)
1593-
"frozendict_itemiterator", /* tp_name */
1592+
"frozendict.itemiterator", /* tp_name */
15941593
sizeof(dictiterobject), /* tp_basicsize */
15951594
0, /* tp_itemsize */
15961595
/* methods */
@@ -1632,9 +1631,9 @@ frozendictkeys_iter(_PyDictViewObject *dv)
16321631
return dictiter_new(dv->dv_dict, &PyFrozenDictIterKey_Type);
16331632
}
16341633

1635-
PyTypeObject PyFrozenDictKeys_Type = {
1634+
static PyTypeObject PyFrozenDictKeys_Type = {
16361635
PyVarObject_HEAD_INIT(NULL, 0)
1637-
"frozendict_keys", /* tp_name */
1636+
"frozendict.keys", /* tp_name */
16381637
sizeof(_PyDictViewObject), /* tp_basicsize */
16391638
0, /* tp_itemsize */
16401639
/* methods */
@@ -1682,9 +1681,9 @@ frozendictitems_iter(_PyDictViewObject *dv)
16821681
return dictiter_new(dv->dv_dict, &PyFrozenDictIterItem_Type);
16831682
}
16841683

1685-
PyTypeObject PyFrozenDictItems_Type = {
1684+
static PyTypeObject PyFrozenDictItems_Type = {
16861685
PyVarObject_HEAD_INIT(NULL, 0)
1687-
"frozendict_items", /* tp_name */
1686+
"frozendict.items", /* tp_name */
16881687
sizeof(_PyDictViewObject), /* tp_basicsize */
16891688
0, /* tp_itemsize */
16901689
/* methods */
@@ -1732,9 +1731,9 @@ frozendictvalues_iter(_PyDictViewObject *dv)
17321731
return dictiter_new(dv->dv_dict, &PyFrozenDictIterValue_Type);
17331732
}
17341733

1735-
PyTypeObject PyFrozenDictValues_Type = {
1734+
static PyTypeObject PyFrozenDictValues_Type = {
17361735
PyVarObject_HEAD_INIT(NULL, 0)
1737-
"frozendict_values", /* tp_name */
1736+
"frozendict.values", /* tp_name */
17381737
sizeof(_PyDictViewObject), /* tp_basicsize */
17391738
0, /* tp_itemsize */
17401739
/* methods */
@@ -1776,11 +1775,37 @@ frozendict_exec(PyObject *m)
17761775
{
17771776
/* Finalize the type object including setting type of the new type
17781777
* object; doing it here is required for portability, too. */
1779-
if (PyType_Ready(&PyFrozenDict_Type) < 0)
1778+
if (PyType_Ready(&PyFrozenDict_Type) < 0) {
17801779
goto fail;
1780+
}
17811781

1782-
if (PyType_Ready(&PyCoold_Type) < 0)
1782+
if (PyType_Ready(&PyCoold_Type) < 0) {
1783+
goto fail;
1784+
}
1785+
1786+
if (PyType_Ready(&PyFrozenDictIterKey_Type) < 0) {
1787+
goto fail;
1788+
}
1789+
1790+
if (PyType_Ready(&PyFrozenDictIterValue_Type) < 0) {
1791+
goto fail;
1792+
}
1793+
1794+
if (PyType_Ready(&PyFrozenDictIterItem_Type) < 0) {
1795+
goto fail;
1796+
}
1797+
1798+
if (PyType_Ready(&PyFrozenDictKeys_Type) < 0) {
1799+
goto fail;
1800+
}
1801+
1802+
if (PyType_Ready(&PyFrozenDictItems_Type) < 0) {
1803+
goto fail;
1804+
}
1805+
1806+
if (PyType_Ready(&PyFrozenDictValues_Type) < 0) {
17831807
goto fail;
1808+
}
17841809

17851810
PyModule_AddObject(m, "frozendict", (PyObject *)&PyFrozenDict_Type);
17861811
PyModule_AddObject(m, "coold", (PyObject *)&PyCoold_Type);

0 commit comments

Comments
 (0)