Commit a32abf5d authored by 's avatar

Backed out the proposed fix for DG's problem until we have more info.

parent 2711d912
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
DAMAGE. DAMAGE.
$Id: Acquisition.c,v 1.39 2000/06/09 17:16:39 jim Exp $ $Id: Acquisition.c,v 1.40 2000/06/12 17:22:28 brian Exp $
If you have questions regarding this software, If you have questions regarding this software,
contact: contact:
...@@ -174,7 +174,6 @@ __of__(PyObject *inst, PyObject *parent) ...@@ -174,7 +174,6 @@ __of__(PyObject *inst, PyObject *parent)
while (WRAPPER(r)->obj && isWrapper(WRAPPER(r)->obj) while (WRAPPER(r)->obj && isWrapper(WRAPPER(r)->obj)
&& (WRAPPER(WRAPPER(r)->obj)->container == && (WRAPPER(WRAPPER(r)->obj)->container ==
WRAPPER(WRAPPER(r)->container)->obj) WRAPPER(WRAPPER(r)->container)->obj)
&& ! isWrapper(WRAPPER(WRAPPER(r)->obj)->container)
) )
{ {
/* Simplify wrapper */ /* Simplify wrapper */
...@@ -1384,7 +1383,7 @@ void ...@@ -1384,7 +1383,7 @@ void
initAcquisition() initAcquisition()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.39 $"; char *rev="$Revision: 1.40 $";
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"
...@@ -1403,7 +1402,7 @@ initAcquisition() ...@@ -1403,7 +1402,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.39 2000/06/09 17:16:39 jim Exp $\n", "$Id: Acquisition.c,v 1.40 2000/06/12 17:22:28 brian Exp $\n",
OBJECT(NULL),PYTHON_API_VERSION); OBJECT(NULL),PYTHON_API_VERSION);
d = PyModule_GetDict(m); d = PyModule_GetDict(m);
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
DAMAGE. DAMAGE.
$Id: Acquisition.c,v 1.39 2000/06/09 17:16:39 jim Exp $ $Id: Acquisition.c,v 1.40 2000/06/12 17:22:28 brian Exp $
If you have questions regarding this software, If you have questions regarding this software,
contact: contact:
...@@ -174,7 +174,6 @@ __of__(PyObject *inst, PyObject *parent) ...@@ -174,7 +174,6 @@ __of__(PyObject *inst, PyObject *parent)
while (WRAPPER(r)->obj && isWrapper(WRAPPER(r)->obj) while (WRAPPER(r)->obj && isWrapper(WRAPPER(r)->obj)
&& (WRAPPER(WRAPPER(r)->obj)->container == && (WRAPPER(WRAPPER(r)->obj)->container ==
WRAPPER(WRAPPER(r)->container)->obj) WRAPPER(WRAPPER(r)->container)->obj)
&& ! isWrapper(WRAPPER(WRAPPER(r)->obj)->container)
) )
{ {
/* Simplify wrapper */ /* Simplify wrapper */
...@@ -1384,7 +1383,7 @@ void ...@@ -1384,7 +1383,7 @@ void
initAcquisition() initAcquisition()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.39 $"; char *rev="$Revision: 1.40 $";
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"
...@@ -1403,7 +1402,7 @@ initAcquisition() ...@@ -1403,7 +1402,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.39 2000/06/09 17:16:39 jim Exp $\n", "$Id: Acquisition.c,v 1.40 2000/06/12 17:22:28 brian Exp $\n",
OBJECT(NULL),PYTHON_API_VERSION); OBJECT(NULL),PYTHON_API_VERSION);
d = PyModule_GetDict(m); d = PyModule_GetDict(m);
......
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