Skip to content

Z
ZEO
Commit 43ff28e5 authored by Jeremy Hylton's avatar Jeremy Hylton
Browse files
Options

Remove use of Python-2.2-specific C API routine PyObject_Call()

parent c88dc766
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 33 deletions
src/Persistence/cPersistence.c
View file @ 43ff28e5
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
static char cPersistence_doc_string[] = static char cPersistence_doc_string[] =
"Defines Persistent mixin class for persistent objects.\n" "Defines Persistent mixin class for persistent objects.\n"
"\n" "\n"
"$Id: cPersistence.c,v 1.44 2001/11/06 17:52:38 jeremy Exp $\n"; "$Id: cPersistence.c,v 1.45 2001/11/06 19:37:00 jeremy Exp $\n";
#include <string.h> #include <string.h>
#include "cPersistence.h" #include "cPersistence.h"
...@@ -163,13 +163,18 @@ callmethod(PyObject *self, PyObject *name) ...@@ -163,13 +163,18 @@ callmethod(PyObject *self, PyObject *name)
static PyObject * static PyObject *
callmethod1(PyObject *self, PyObject *name, PyObject *arg) callmethod1(PyObject *self, PyObject *name, PyObject *arg)
{ {
if((self=PyObject_GetAttr(self,name)) && (name=PyTuple_New(1))) self = PyObject_GetAttr(self, name);
UNLESS(self) return NULL;
name = PyTuple_New(1);
UNLESS(name)
{ {
PyTuple_SET_ITEM(name, 0, arg); Py_DECREF(self);
ASSIGN(self,PyObject_CallObject(self,name)); return NULL;
PyTuple_SET_ITEM(name, 0, NULL);
Py_DECREF(name);
} }
PyTuple_SET_ITEM(name, 0, arg);
ASSIGN(self, PyObject_CallObject(self, name));
PyTuple_SET_ITEM(name, 0, NULL);
Py_DECREF(name);
return self; return self;
} }
...@@ -359,7 +364,7 @@ Per__setstate__(cPersistentObject *self, PyObject *args) ...@@ -359,7 +364,7 @@ Per__setstate__(cPersistentObject *self, PyObject *args)
{ {
UNLESS_ASSIGN(key,PySequence_GetItem(keys,i)) goto err; UNLESS_ASSIGN(key,PySequence_GetItem(keys,i)) goto err;
UNLESS_ASSIGN(e,PyObject_GetItem(v,key)) goto err; UNLESS_ASSIGN(e,PyObject_GetItem(v,key)) goto err;
UNLESS(-1 != PyObject_SetItem(__dict__,key,e)) goto err; UNLESS(-1 != PyDict_SetItem(__dict__,key,e)) goto err;
} }
Py_XDECREF(key); Py_XDECREF(key);
...@@ -755,7 +760,7 @@ void ...@@ -755,7 +760,7 @@ void
initcPersistence(void) initcPersistence(void)
{ {
PyObject *m, *d, *s; PyObject *m, *d, *s;
char *rev="$Revision: 1.44 $"; char *rev="$Revision: 1.45 $";
s = PyString_FromString("TimeStamp"); s = PyString_FromString("TimeStamp");
if (s == NULL) if (s == NULL)
......
src/Persistence/cPickleCache.c
View file @ 43ff28e5
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
static char cPickleCache_doc_string[] = static char cPickleCache_doc_string[] =
"Defines the PickleCache used by ZODB Connection objects.\n" "Defines the PickleCache used by ZODB Connection objects.\n"
"\n" "\n"
"$Id: cPickleCache.c,v 1.34 2001/11/06 17:52:38 jeremy Exp $\n"; "$Id: cPickleCache.c,v 1.35 2001/11/06 19:37:00 jeremy Exp $\n";
#define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;} #define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;}
#define UNLESS(E) if(!(E)) #define UNLESS(E) if(!(E))
...@@ -406,7 +406,7 @@ _invalidate(ccobject *self, PyObject *key) ...@@ -406,7 +406,7 @@ _invalidate(ccobject *self, PyObject *key)
if (t) if (t)
{ {
PyTuple_SET_ITEM(t, 0, v); PyTuple_SET_ITEM(t, 0, v);
v = PyObject_Call(self->setklassstate, t, NULL); v = PyObject_CallObject(self->setklassstate, t);
PyTuple_SET_ITEM(t, 0, NULL); PyTuple_SET_ITEM(t, 0, NULL);
Py_DECREF(t); Py_DECREF(t);
} }
...@@ -727,7 +727,7 @@ void ...@@ -727,7 +727,7 @@ void
initcPickleCache(void) initcPickleCache(void)
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.34 $"; char *rev="$Revision: 1.35 $";
Cctype.ob_type=&PyType_Type; Cctype.ob_type=&PyType_Type;
......
src/ZODB/cPersistence.c
View file @ 43ff28e5
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
static char cPersistence_doc_string[] = static char cPersistence_doc_string[] =
"Defines Persistent mixin class for persistent objects.\n" "Defines Persistent mixin class for persistent objects.\n"
"\n" "\n"
"$Id: cPersistence.c,v 1.44 2001/11/06 17:52:38 jeremy Exp $\n"; "$Id: cPersistence.c,v 1.45 2001/11/06 19:37:00 jeremy Exp $\n";
#include <string.h> #include <string.h>
#include "cPersistence.h" #include "cPersistence.h"
...@@ -163,13 +163,18 @@ callmethod(PyObject *self, PyObject *name) ...@@ -163,13 +163,18 @@ callmethod(PyObject *self, PyObject *name)
static PyObject * static PyObject *
callmethod1(PyObject *self, PyObject *name, PyObject *arg) callmethod1(PyObject *self, PyObject *name, PyObject *arg)
{ {
if((self=PyObject_GetAttr(self,name)) && (name=PyTuple_New(1))) self = PyObject_GetAttr(self, name);
UNLESS(self) return NULL;
name = PyTuple_New(1);
UNLESS(name)
{ {
PyTuple_SET_ITEM(name, 0, arg); Py_DECREF(self);
ASSIGN(self,PyObject_CallObject(self,name)); return NULL;
PyTuple_SET_ITEM(name, 0, NULL);
Py_DECREF(name);
} }
PyTuple_SET_ITEM(name, 0, arg);
ASSIGN(self, PyObject_CallObject(self, name));
PyTuple_SET_ITEM(name, 0, NULL);
Py_DECREF(name);
return self; return self;
} }
...@@ -359,7 +364,7 @@ Per__setstate__(cPersistentObject *self, PyObject *args) ...@@ -359,7 +364,7 @@ Per__setstate__(cPersistentObject *self, PyObject *args)
{ {
UNLESS_ASSIGN(key,PySequence_GetItem(keys,i)) goto err; UNLESS_ASSIGN(key,PySequence_GetItem(keys,i)) goto err;
UNLESS_ASSIGN(e,PyObject_GetItem(v,key)) goto err; UNLESS_ASSIGN(e,PyObject_GetItem(v,key)) goto err;
UNLESS(-1 != PyObject_SetItem(__dict__,key,e)) goto err; UNLESS(-1 != PyDict_SetItem(__dict__,key,e)) goto err;
} }
Py_XDECREF(key); Py_XDECREF(key);
...@@ -755,7 +760,7 @@ void ...@@ -755,7 +760,7 @@ void
initcPersistence(void) initcPersistence(void)
{ {
PyObject *m, *d, *s; PyObject *m, *d, *s;
char *rev="$Revision: 1.44 $"; char *rev="$Revision: 1.45 $";
s = PyString_FromString("TimeStamp"); s = PyString_FromString("TimeStamp");
if (s == NULL) if (s == NULL)
......
src/ZODB/cPickleCache.c
View file @ 43ff28e5
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
static char cPickleCache_doc_string[] = static char cPickleCache_doc_string[] =
"Defines the PickleCache used by ZODB Connection objects.\n" "Defines the PickleCache used by ZODB Connection objects.\n"
"\n" "\n"
"$Id: cPickleCache.c,v 1.34 2001/11/06 17:52:38 jeremy Exp $\n"; "$Id: cPickleCache.c,v 1.35 2001/11/06 19:37:00 jeremy Exp $\n";
#define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;} #define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;}
#define UNLESS(E) if(!(E)) #define UNLESS(E) if(!(E))
...@@ -406,7 +406,7 @@ _invalidate(ccobject *self, PyObject *key) ...@@ -406,7 +406,7 @@ _invalidate(ccobject *self, PyObject *key)
if (t) if (t)
{ {
PyTuple_SET_ITEM(t, 0, v); PyTuple_SET_ITEM(t, 0, v);
v = PyObject_Call(self->setklassstate, t, NULL); v = PyObject_CallObject(self->setklassstate, t);
PyTuple_SET_ITEM(t, 0, NULL); PyTuple_SET_ITEM(t, 0, NULL);
Py_DECREF(t); Py_DECREF(t);
} }
...@@ -727,7 +727,7 @@ void ...@@ -727,7 +727,7 @@ void
initcPickleCache(void) initcPickleCache(void)
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.34 $"; char *rev="$Revision: 1.35 $";
Cctype.ob_type=&PyType_Type; Cctype.ob_type=&PyType_Type;
......
src/persistent/cPersistence.c
View file @ 43ff28e5
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
static char cPersistence_doc_string[] = static char cPersistence_doc_string[] =
"Defines Persistent mixin class for persistent objects.\n" "Defines Persistent mixin class for persistent objects.\n"
"\n" "\n"
"$Id: cPersistence.c,v 1.44 2001/11/06 17:52:38 jeremy Exp $\n"; "$Id: cPersistence.c,v 1.45 2001/11/06 19:37:00 jeremy Exp $\n";
#include <string.h> #include <string.h>
#include "cPersistence.h" #include "cPersistence.h"
...@@ -163,13 +163,18 @@ callmethod(PyObject *self, PyObject *name) ...@@ -163,13 +163,18 @@ callmethod(PyObject *self, PyObject *name)
static PyObject * static PyObject *
callmethod1(PyObject *self, PyObject *name, PyObject *arg) callmethod1(PyObject *self, PyObject *name, PyObject *arg)
{ {
if((self=PyObject_GetAttr(self,name)) && (name=PyTuple_New(1))) self = PyObject_GetAttr(self, name);
UNLESS(self) return NULL;
name = PyTuple_New(1);
UNLESS(name)
{ {
PyTuple_SET_ITEM(name, 0, arg); Py_DECREF(self);
ASSIGN(self,PyObject_CallObject(self,name)); return NULL;
PyTuple_SET_ITEM(name, 0, NULL);
Py_DECREF(name);
} }
PyTuple_SET_ITEM(name, 0, arg);
ASSIGN(self, PyObject_CallObject(self, name));
PyTuple_SET_ITEM(name, 0, NULL);
Py_DECREF(name);
return self; return self;
} }
...@@ -359,7 +364,7 @@ Per__setstate__(cPersistentObject *self, PyObject *args) ...@@ -359,7 +364,7 @@ Per__setstate__(cPersistentObject *self, PyObject *args)
{ {
UNLESS_ASSIGN(key,PySequence_GetItem(keys,i)) goto err; UNLESS_ASSIGN(key,PySequence_GetItem(keys,i)) goto err;
UNLESS_ASSIGN(e,PyObject_GetItem(v,key)) goto err; UNLESS_ASSIGN(e,PyObject_GetItem(v,key)) goto err;
UNLESS(-1 != PyObject_SetItem(__dict__,key,e)) goto err; UNLESS(-1 != PyDict_SetItem(__dict__,key,e)) goto err;
} }
Py_XDECREF(key); Py_XDECREF(key);
...@@ -755,7 +760,7 @@ void ...@@ -755,7 +760,7 @@ void
initcPersistence(void) initcPersistence(void)
{ {
PyObject *m, *d, *s; PyObject *m, *d, *s;
char *rev="$Revision: 1.44 $"; char *rev="$Revision: 1.45 $";
s = PyString_FromString("TimeStamp"); s = PyString_FromString("TimeStamp");
if (s == NULL) if (s == NULL)
......
src/persistent/cPickleCache.c
View file @ 43ff28e5
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
static char cPickleCache_doc_string[] = static char cPickleCache_doc_string[] =
"Defines the PickleCache used by ZODB Connection objects.\n" "Defines the PickleCache used by ZODB Connection objects.\n"
"\n" "\n"
"$Id: cPickleCache.c,v 1.34 2001/11/06 17:52:38 jeremy Exp $\n"; "$Id: cPickleCache.c,v 1.35 2001/11/06 19:37:00 jeremy Exp $\n";
#define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;} #define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;}
#define UNLESS(E) if(!(E)) #define UNLESS(E) if(!(E))
...@@ -406,7 +406,7 @@ _invalidate(ccobject *self, PyObject *key) ...@@ -406,7 +406,7 @@ _invalidate(ccobject *self, PyObject *key)
if (t) if (t)
{ {
PyTuple_SET_ITEM(t, 0, v); PyTuple_SET_ITEM(t, 0, v);
v = PyObject_Call(self->setklassstate, t, NULL); v = PyObject_CallObject(self->setklassstate, t);
PyTuple_SET_ITEM(t, 0, NULL); PyTuple_SET_ITEM(t, 0, NULL);
Py_DECREF(t); Py_DECREF(t);
} }
...@@ -727,7 +727,7 @@ void ...@@ -727,7 +727,7 @@ void
initcPickleCache(void) initcPickleCache(void)
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.34 $"; char *rev="$Revision: 1.35 $";
Cctype.ob_type=&PyType_Type; Cctype.ob_type=&PyType_Type;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7