@@ -51,7 +51,7 @@ ApgRecord_New(PyObject *mapping, Py_ssize_t size)
51
51
Py_INCREF (mapping );
52
52
o -> mapping = mapping ;
53
53
o -> self_hash = -1 ;
54
- _PyObject_GC_TRACK (o );
54
+ PyObject_GC_Track (o );
55
55
return (PyObject * ) o ;
56
56
}
57
57
@@ -509,7 +509,7 @@ static PyMethodDef record_methods[] = {
509
509
510
510
511
511
PyTypeObject ApgRecord_Type = {
512
- PyVarObject_HEAD_INIT (& PyType_Type , 0 )
512
+ PyVarObject_HEAD_INIT (NULL , 0 )
513
513
"Record" , /* tp_name */
514
514
sizeof (ApgRecordObject ) - sizeof (PyObject * ), /* tp_basic_size */
515
515
sizeof (PyObject * ), /* tp_itemsize */
@@ -565,7 +565,7 @@ typedef struct {
565
565
static void
566
566
record_iter_dealloc (ApgRecordIterObject * it )
567
567
{
568
- _PyObject_GC_UNTRACK (it );
568
+ PyObject_GC_UnTrack (it );
569
569
Py_CLEAR (it -> it_seq );
570
570
PyObject_GC_Del (it );
571
571
}
@@ -627,7 +627,7 @@ static PyMethodDef record_iter_methods[] = {
627
627
628
628
629
629
PyTypeObject ApgRecordIter_Type = {
630
- PyVarObject_HEAD_INIT (& PyType_Type , 0 )
630
+ PyVarObject_HEAD_INIT (NULL , 0 )
631
631
"RecordIterator" , /* tp_name */
632
632
sizeof (ApgRecordIterObject ), /* tp_basicsize */
633
633
0 , /* tp_itemsize */
@@ -675,7 +675,7 @@ record_iter(PyObject *seq)
675
675
it -> it_index = 0 ;
676
676
Py_INCREF (seq );
677
677
it -> it_seq = (ApgRecordObject * )seq ;
678
- _PyObject_GC_TRACK (it );
678
+ PyObject_GC_Track (it );
679
679
return (PyObject * )it ;
680
680
}
681
681
@@ -694,7 +694,7 @@ typedef struct {
694
694
static void
695
695
record_items_dealloc (ApgRecordItemsObject * it )
696
696
{
697
- _PyObject_GC_UNTRACK (it );
697
+ PyObject_GC_UnTrack (it );
698
698
Py_CLEAR (it -> it_map_iter );
699
699
Py_CLEAR (it -> it_seq );
700
700
PyObject_GC_Del (it );
@@ -784,7 +784,7 @@ static PyMethodDef record_items_methods[] = {
784
784
785
785
786
786
PyTypeObject ApgRecordItems_Type = {
787
- PyVarObject_HEAD_INIT (& PyType_Type , 0 )
787
+ PyVarObject_HEAD_INIT (NULL , 0 )
788
788
"RecordItemsIterator" , /* tp_name */
789
789
sizeof (ApgRecordItemsObject ), /* tp_basicsize */
790
790
0 , /* tp_itemsize */
@@ -841,7 +841,25 @@ record_new_items_iter(PyObject *seq)
841
841
it -> it_index = 0 ;
842
842
Py_INCREF (seq );
843
843
it -> it_seq = (ApgRecordObject * )seq ;
844
- _PyObject_GC_TRACK (it );
844
+ PyObject_GC_Track (it );
845
845
846
846
return (PyObject * )it ;
847
847
}
848
+
849
+
850
+ int ApgRecord_InitTypes (void )
851
+ {
852
+ if (PyType_Ready (& ApgRecord_Type ) < 0 ) {
853
+ return -1 ;
854
+ }
855
+
856
+ if (PyType_Ready (& ApgRecordIter_Type ) < 0 ) {
857
+ return -1 ;
858
+ }
859
+
860
+ if (PyType_Ready (& ApgRecordItems_Type ) < 0 ) {
861
+ return -1 ;
862
+ }
863
+
864
+ return 0 ;
865
+ }
0 commit comments