python-fam/python-fam-1.1.1-2.diff

   1 diff -Nurw src/python-fam-1.1.1/_fam.c src2/python-fam-1.1.1/_fam.c
   2 --- src/python-fam-1.1.1/_fam.c 2005-04-10 07:48:45.000000000 +0000
   3 +++ src2/python-fam-1.1.1/_fam.c        2008-02-26 09:37:10.000000000 +0000
   4 @@ -112,7 +112,7 @@
   5    fprintf(stderr, "_fam: deleting connection object.\n");
   6  #endif
   7    _fam_close(self, NULL);
   8 -  PyMem_DEL(self);
   9 +  PyObject_Del(self);
  10  }
  11
  12  static PyTypeObject _fam_connection_type = {
  13 @@ -215,7 +215,7 @@
  14    fprintf(stderr, "_fam: deleting request object.\n");
  15  #endif
  16    _fam_cancel_monitor(self, NULL);
  17 -  PyMem_DEL(self);
  18 +  PyObject_Del(self);
  19  }
  20
  21  static PyTypeObject _fam_request_type = {
  22 @@ -357,7 +357,7 @@
  23        fe_obj->fc_obj = NULL;
  24      }
  25      Py_XDECREF(fe_obj->attr);
  26 -    PyMem_DEL(fe_obj);
  27 +    PyObject_Del(fe_obj);
  28    }
  29  }
  30
  31 @@ -435,7 +435,7 @@
  32
  33    int rc;
  34
  35 -  _fam_connection_object *fc_obj = PyObject_NEW(_fam_connection_object, &_fam_connection_type);
  36 +  _fam_connection_object *fc_obj = PyObject_New(_fam_connection_object, &_fam_connection_type);
  37    if (!fc_obj)
  38      return NULL;
  39
  40 @@ -498,7 +498,7 @@
  41      if (!PyArg_ParseTuple(args, "sO", &filename, &userData))
  42        return NULL;
  43
  44 -    fr_obj = PyObject_NEW(_fam_request_object, &_fam_request_type);
  45 +    fr_obj = PyObject_New(_fam_request_object, &_fam_request_type);
  46      if (!fr_obj)
  47        return NULL;
  48
  49 @@ -545,7 +545,7 @@
  50      if (!PyArg_ParseTuple(args, "sO", &filename, &userData))
  51        return NULL;
  52
  53 -    fr_obj = PyObject_NEW(_fam_request_object, &_fam_request_type);
  54 +    fr_obj = PyObject_New(_fam_request_object, &_fam_request_type);
  55      if (!fr_obj)
  56        return NULL;
  57
  58 @@ -647,7 +647,7 @@
  59
  60    if (fc_obj->fc) {
  61
  62 -    fe_obj = PyObject_NEW(_fam_event_object, &_fam_event_type);
  63 +    fe_obj = PyObject_New(_fam_event_object, &_fam_event_type);
  64      if (!fe_obj)
  65        return NULL;
  66
  67 Binary files src/python-fam-1.1.1/build/lib.linux-i686-2.5/_fam.so and src2/python-fam-1.1.1/build/lib.linux-i686-2.5/_fam.so differ
  68 Binary files src/python-fam-1.1.1/build/temp.linux-i686-2.5/_fam.o and src2/python-fam-1.1.1/build/temp.linux-i686-2.5/_fam.o differ
  69 diff -Nurw src/python-fam-1.1.1/test.py src2/python-fam-1.1.1/test.py
  70 --- src/python-fam-1.1.1/test.py        2005-04-10 07:48:45.000000000 +0000
  71 +++ src2/python-fam-1.1.1/test.py       2008-02-26 09:41:24.000000000 +0000
  72 @@ -1,4 +1,4 @@
  73 -#!/usr/bin/python2.2
  74 +#!/usr/bin/python
  75  # This file is part of Python FAM.
  76  # Copyright (C) 2002 Robert Sander <robert.sander@epigenomics.com>
  77  #
  78 diff -Nurw src/python-fam-1.1.1/test2.py src2/python-fam-1.1.1/test2.py
  79 --- src/python-fam-1.1.1/test2.py       2005-04-10 07:48:45.000000000 +0000
  80 +++ src2/python-fam-1.1.1/test2.py      2008-02-26 09:41:31.000000000 +0000
  81 @@ -1,4 +1,4 @@
  82 -#!/usr/bin/python2.2
  83 +#!/usr/bin/python
  84  # This file is part of Python FAM.
  85  # Copyright (C) 2002 Robert Sander <robert.sander@epigenomics.com>
  86  #