More fixing for modern Pythons. No longer works with 2.2. Sorry.

[catacomb-python] / mp.c

diff --git a/mp.c b/mp.c
index a2bd7dc1831a2bb9088c6378e72bcc4b96a1accb..e14b3a0d1d8a58b039b9a77bbc5abdcc82d59acb 100644 (file)
--- a/mp.c
+++ b/mp.c
@@ -179,7 +179,7 @@ end:
 static void mp_pydealloc(PyObject *o)
 {
   MP_DROP(MP_X(o));
 static void mp_pydealloc(PyObject *o)
 {
   MP_DROP(MP_X(o));

-  PyObject_DEL(o);
+  FREEOBJ(o);

 }
 
 static PyObject *mp_pyrepr(PyObject *o)
 }
 
 static PyObject *mp_pyrepr(PyObject *o)


@@ -863,7 +863,7 @@ Notes:\n\
   0,                                   /* @tp_init@ */
   PyType_GenericAlloc,                 /* @tp_alloc@ */
   mp_pynew,                            /* @tp_new@ */
   0,                                   /* @tp_init@ */
   PyType_GenericAlloc,                 /* @tp_alloc@ */
   mp_pynew,                            /* @tp_new@ */

-  _PyObject_Del,                       /* @tp_free@ */
+  0,                                   /* @tp_free@ */

   0                                    /* @tp_is_gc@ */
 };
 
   0                                    /* @tp_is_gc@ */
 };
 


@@ -1102,7 +1102,7 @@ end:
 static void mpmont_pydealloc(PyObject *me)
 {
   mpmont_destroy(MPMONT_PY(me));
 static void mpmont_pydealloc(PyObject *me)
 {
   mpmont_destroy(MPMONT_PY(me));

-  PyObject_DEL(me);
+  FREEOBJ(me);

 }
 
 static PyObject *mpmont_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
 }
 
 static PyObject *mpmont_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)


@@ -1201,7 +1201,7 @@ static PyTypeObject *mpmont_pytype, mpmont_pytype_skel = {
   0,                                   /* @tp_init@ */
   PyType_GenericAlloc,                 /* @tp_alloc@ */
   mpmont_pynew,                                /* @tp_new@ */
   0,                                   /* @tp_init@ */
   PyType_GenericAlloc,                 /* @tp_alloc@ */
   mpmont_pynew,                                /* @tp_new@ */

-  _PyObject_Del,                       /* @tp_free@ */
+  0,                                   /* @tp_free@ */

   0                                    /* @tp_is_gc@ */
 };
 
   0                                    /* @tp_is_gc@ */
 };
 


@@ -1255,7 +1255,7 @@ end:
 static void mpbarrett_pydealloc(PyObject *me)
 {
   mpbarrett_destroy(MPBARRETT_PY(me));
 static void mpbarrett_pydealloc(PyObject *me)
 {
   mpbarrett_destroy(MPBARRETT_PY(me));

-  PyObject_DEL(me);
+  FREEOBJ(me);

 }
 
 static PyObject *mpbarrett_pynew(PyTypeObject *ty,
 }
 
 static PyObject *mpbarrett_pynew(PyTypeObject *ty,


@@ -1340,7 +1340,7 @@ static PyTypeObject *mpbarrett_pytype, mpbarrett_pytype_skel = {
   0,                                   /* @tp_init@ */
   PyType_GenericAlloc,                 /* @tp_alloc@ */
   mpbarrett_pynew,                     /* @tp_new@ */
   0,                                   /* @tp_init@ */
   PyType_GenericAlloc,                 /* @tp_alloc@ */
   mpbarrett_pynew,                     /* @tp_new@ */

-  _PyObject_Del,                       /* @tp_free@ */
+  0,                                   /* @tp_free@ */

   0                                    /* @tp_is_gc@ */
 };
 
   0                                    /* @tp_is_gc@ */
 };
 


@@ -1384,7 +1384,7 @@ end:
 static void mpreduce_pydealloc(PyObject *me)
 {
   mpreduce_destroy(MPREDUCE_PY(me));
 static void mpreduce_pydealloc(PyObject *me)
 {
   mpreduce_destroy(MPREDUCE_PY(me));

-  PyObject_DEL(me);
+  FREEOBJ(me);

 }
 
 static PyObject *mpreduce_pynew(PyTypeObject *ty,
 }
 
 static PyObject *mpreduce_pynew(PyTypeObject *ty,


@@ -1468,7 +1468,7 @@ static PyTypeObject *mpreduce_pytype, mpreduce_pytype_skel = {
   0,                                   /* @tp_init@ */
   PyType_GenericAlloc,                 /* @tp_alloc@ */
   mpreduce_pynew,                      /* @tp_new@ */
   0,                                   /* @tp_init@ */
   PyType_GenericAlloc,                 /* @tp_alloc@ */
   mpreduce_pynew,                      /* @tp_new@ */

-  _PyObject_Del,                       /* @tp_free@ */
+  0,                                   /* @tp_free@ */

   0                                    /* @tp_is_gc@ */
 };
 
   0                                    /* @tp_is_gc@ */
 };
 


@@ -1637,7 +1637,7 @@ static PyTypeObject *mpcrt_pytype, mpcrt_pytype_skel = {
   0,                                   /* @tp_init@ */
   PyType_GenericAlloc,                 /* @tp_alloc@ */
   mpcrt_pynew,                         /* @tp_new@ */
   0,                                   /* @tp_init@ */
   PyType_GenericAlloc,                 /* @tp_alloc@ */
   mpcrt_pynew,                         /* @tp_new@ */

-  _PyObject_Del,                       /* @tp_free@ */
+  0,                                   /* @tp_free@ */

   0                                    /* @tp_is_gc@ */
 };
 
   0                                    /* @tp_is_gc@ */
 };
 


@@ -1932,7 +1932,7 @@ Notes:\n\
   0,                                   /* @tp_init@ */
   PyType_GenericAlloc,                 /* @tp_alloc@ */
   gf_pynew,                            /* @tp_new@ */
   0,                                   /* @tp_init@ */
   PyType_GenericAlloc,                 /* @tp_alloc@ */
   gf_pynew,                            /* @tp_new@ */

-  _PyObject_Del,                       /* @tp_free@ */
+  0,                                   /* @tp_free@ */

   0                                    /* @tp_is_gc@ */
 };
 
   0                                    /* @tp_is_gc@ */
 };
 


@@ -2001,7 +2001,7 @@ end:
 static void gfreduce_pydealloc(PyObject *me)
 {
   gfreduce_destroy(GFREDUCE_PY(me));
 static void gfreduce_pydealloc(PyObject *me)
 {
   gfreduce_destroy(GFREDUCE_PY(me));

-  PyObject_DEL(me);
+  FREEOBJ(me);

 }
 
 static PyObject *gfreduce_pynew(PyTypeObject *ty,
 }
 
 static PyObject *gfreduce_pynew(PyTypeObject *ty,


@@ -2085,7 +2085,7 @@ static PyTypeObject *gfreduce_pytype, gfreduce_pytype_skel = {
   0,                                   /* @tp_init@ */
   PyType_GenericAlloc,                 /* @tp_alloc@ */
   gfreduce_pynew,                      /* @tp_new@ */
   0,                                   /* @tp_init@ */
   PyType_GenericAlloc,                 /* @tp_alloc@ */
   gfreduce_pynew,                      /* @tp_new@ */

-  _PyObject_Del,                       /* @tp_free@ */
+  0,                                   /* @tp_free@ */

   0                                    /* @tp_is_gc@ */
 };
 
   0                                    /* @tp_is_gc@ */
 };
 


@@ -2114,7 +2114,7 @@ static PyObject *gfn_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
     goto end;
   gg = PyObject_New(gfn_pyobj, ty);
   if (gfn_create(p, beta, &gg->ntop, &gg->pton)) {
     goto end;
   gg = PyObject_New(gfn_pyobj, ty);
   if (gfn_create(p, beta, &gg->ntop, &gg->pton)) {

-    PyObject_DEL(gg);
+    FREEOBJ(gg);

     gg = 0;
     VALERR("can't invert transformation matrix");
   }
     gg = 0;
     VALERR("can't invert transformation matrix");
   }


@@ -2156,7 +2156,7 @@ static void gfn_pydealloc(PyObject *me)
 {
   gfn_destroy(GFN_PTON(me));
   gfn_destroy(GFN_NTOP(me));
 {
   gfn_destroy(GFN_PTON(me));
   gfn_destroy(GFN_NTOP(me));

-  PyObject_DEL(me);
+  FREEOBJ(me);

 }
 
 static PyGetSetDef gfn_pygetset[] = {
 }
 
 static PyGetSetDef gfn_pygetset[] = {


@@ -2220,7 +2220,7 @@ and normal basis representations.",
   0,                                   /* @tp_init@ */
   PyType_GenericAlloc,                 /* @tp_alloc@ */
   gfn_pynew,                           /* @tp_new@ */
   0,                                   /* @tp_init@ */
   PyType_GenericAlloc,                 /* @tp_alloc@ */
   gfn_pynew,                           /* @tp_new@ */

-  _PyObject_Del,                       /* @tp_free@ */
+  0,                                   /* @tp_free@ */

   0                                    /* @tp_is_gc@ */
 };
 
   0                                    /* @tp_is_gc@ */
 };