Skip to content

Z
Zope
Commit 679fc2e8 authored by Jim Fulton's avatar Jim Fulton
Browse files
Options

Changed filter machinery so that wrapped objects are used as 

inst and parent in filter.
parent d0d9ec96
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 18 deletions
lib/Components/ExtensionClass/Acquisition.c
View file @ 679fc2e8
/* /*
$Id: Acquisition.c,v 1.11 1997/11/07 19:00:34 jim Exp $ $Id: Acquisition.c,v 1.12 1997/11/19 13:39:32 jim Exp $
Acquisition Wrappers -- Implementation of acquisition through wrappers Acquisition Wrappers -- Implementation of acquisition through wrappers
...@@ -379,7 +379,7 @@ Wrapper_acquire(Wrapper *self, PyObject *oname, ...@@ -379,7 +379,7 @@ Wrapper_acquire(Wrapper *self, PyObject *oname,
else if(has__of__(r)) else if(has__of__(r))
ASSIGN(r,CallMethodO(r,py__of__,Build("(O)", self), NULL)); ASSIGN(r,CallMethodO(r,py__of__,Build("(O)", self), NULL));
if(filter) if(filter)
switch(apply_filter(filter,self->obj,oname,r,extra,orig)) switch(apply_filter(filter,self,oname,r,extra,orig))
{ {
case -1: return NULL; case -1: return NULL;
case 1: return r; case 1: return r;
...@@ -623,14 +623,11 @@ static PyMappingMethods Wrapper_as_mapping = { ...@@ -623,14 +623,11 @@ static PyMappingMethods Wrapper_as_mapping = {
static PyObject * static PyObject *
Wrapper_acquire_method(Wrapper *self, PyObject *args) Wrapper_acquire_method(Wrapper *self, PyObject *args)
{ {
PyObject *name, *filter=0, *extra=Py_None, *orig; PyObject *name, *filter=0, *extra=Py_None;
UNLESS(PyArg_ParseTuple(args,"O|OO",&name,&filter,&extra)) return NULL; UNLESS(PyArg_ParseTuple(args,"O|OO",&name,&filter,&extra)) return NULL;
if(self->obj) orig=self->obj; return Wrapper_acquire(self,name,filter,extra,self);
else orig=Py_None;
return Wrapper_acquire(self,name,filter,extra,orig);
} }
static struct PyMethodDef Wrapper_methods[] = { static struct PyMethodDef Wrapper_methods[] = {
...@@ -755,7 +752,7 @@ void ...@@ -755,7 +752,7 @@ void
initAcquisition() initAcquisition()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.11 $"; char *rev="$Revision: 1.12 $";
PURE_MIXIN_CLASS(Acquirer, PURE_MIXIN_CLASS(Acquirer,
"Base class for objects that implicitly" "Base class for objects that implicitly"
" acquire attributes from containers\n" " acquire attributes from containers\n"
...@@ -770,7 +767,7 @@ initAcquisition() ...@@ -770,7 +767,7 @@ initAcquisition()
/* Create the module and add the functions */ /* Create the module and add the functions */
m = Py_InitModule4("Acquisition", methods, m = Py_InitModule4("Acquisition", methods,
"Provide base classes for acquiring objects\n\n" "Provide base classes for acquiring objects\n\n"
"$Id: Acquisition.c,v 1.11 1997/11/07 19:00:34 jim Exp $\n", "$Id: Acquisition.c,v 1.12 1997/11/19 13:39:32 jim Exp $\n",
(PyObject*)NULL,PYTHON_API_VERSION); (PyObject*)NULL,PYTHON_API_VERSION);
d = PyModule_GetDict(m); d = PyModule_GetDict(m);
...@@ -792,6 +789,10 @@ initAcquisition() ...@@ -792,6 +789,10 @@ initAcquisition()
/***************************************************************************** /*****************************************************************************
$Log: Acquisition.c,v $ $Log: Acquisition.c,v $
Revision 1.12 1997/11/19 13:39:32 jim
Changed filter machinery so that wrapped objects are used as
inst and parent in filter.
Revision 1.11 1997/11/07 19:00:34 jim Revision 1.11 1997/11/07 19:00:34 jim
Added compile option to implicitly acquire __roles__. Added compile option to implicitly acquire __roles__.
......
lib/Components/ExtensionClass/src/Acquisition.c
View file @ 679fc2e8
/* /*
$Id: Acquisition.c,v 1.11 1997/11/07 19:00:34 jim Exp $ $Id: Acquisition.c,v 1.12 1997/11/19 13:39:32 jim Exp $
Acquisition Wrappers -- Implementation of acquisition through wrappers Acquisition Wrappers -- Implementation of acquisition through wrappers
...@@ -379,7 +379,7 @@ Wrapper_acquire(Wrapper *self, PyObject *oname, ...@@ -379,7 +379,7 @@ Wrapper_acquire(Wrapper *self, PyObject *oname,
else if(has__of__(r)) else if(has__of__(r))
ASSIGN(r,CallMethodO(r,py__of__,Build("(O)", self), NULL)); ASSIGN(r,CallMethodO(r,py__of__,Build("(O)", self), NULL));
if(filter) if(filter)
switch(apply_filter(filter,self->obj,oname,r,extra,orig)) switch(apply_filter(filter,self,oname,r,extra,orig))
{ {
case -1: return NULL; case -1: return NULL;
case 1: return r; case 1: return r;
...@@ -623,14 +623,11 @@ static PyMappingMethods Wrapper_as_mapping = { ...@@ -623,14 +623,11 @@ static PyMappingMethods Wrapper_as_mapping = {
static PyObject * static PyObject *
Wrapper_acquire_method(Wrapper *self, PyObject *args) Wrapper_acquire_method(Wrapper *self, PyObject *args)
{ {
PyObject *name, *filter=0, *extra=Py_None, *orig; PyObject *name, *filter=0, *extra=Py_None;
UNLESS(PyArg_ParseTuple(args,"O|OO",&name,&filter,&extra)) return NULL; UNLESS(PyArg_ParseTuple(args,"O|OO",&name,&filter,&extra)) return NULL;
if(self->obj) orig=self->obj; return Wrapper_acquire(self,name,filter,extra,self);
else orig=Py_None;
return Wrapper_acquire(self,name,filter,extra,orig);
} }
static struct PyMethodDef Wrapper_methods[] = { static struct PyMethodDef Wrapper_methods[] = {
...@@ -755,7 +752,7 @@ void ...@@ -755,7 +752,7 @@ void
initAcquisition() initAcquisition()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.11 $"; char *rev="$Revision: 1.12 $";
PURE_MIXIN_CLASS(Acquirer, PURE_MIXIN_CLASS(Acquirer,
"Base class for objects that implicitly" "Base class for objects that implicitly"
" acquire attributes from containers\n" " acquire attributes from containers\n"
...@@ -770,7 +767,7 @@ initAcquisition() ...@@ -770,7 +767,7 @@ initAcquisition()
/* Create the module and add the functions */ /* Create the module and add the functions */
m = Py_InitModule4("Acquisition", methods, m = Py_InitModule4("Acquisition", methods,
"Provide base classes for acquiring objects\n\n" "Provide base classes for acquiring objects\n\n"
"$Id: Acquisition.c,v 1.11 1997/11/07 19:00:34 jim Exp $\n", "$Id: Acquisition.c,v 1.12 1997/11/19 13:39:32 jim Exp $\n",
(PyObject*)NULL,PYTHON_API_VERSION); (PyObject*)NULL,PYTHON_API_VERSION);
d = PyModule_GetDict(m); d = PyModule_GetDict(m);
...@@ -792,6 +789,10 @@ initAcquisition() ...@@ -792,6 +789,10 @@ initAcquisition()
/***************************************************************************** /*****************************************************************************
$Log: Acquisition.c,v $ $Log: Acquisition.c,v $
Revision 1.12 1997/11/19 13:39:32 jim
Changed filter machinery so that wrapped objects are used as
inst and parent in filter.
Revision 1.11 1997/11/07 19:00:34 jim Revision 1.11 1997/11/07 19:00:34 jim
Added compile option to implicitly acquire __roles__. Added compile option to implicitly acquire __roles__.
......
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