Log message for revision 41204: zLOG -> logging Changed: U Zope/trunk/lib/python/AccessControl/cAccessControl.c A Zope/trunk/lib/python/AccessControl/logger_wrapper.py
-=- Modified: Zope/trunk/lib/python/AccessControl/cAccessControl.c =================================================================== --- Zope/trunk/lib/python/AccessControl/cAccessControl.c 2006-01-08 11:08:49 UTC (rev 41203) +++ Zope/trunk/lib/python/AccessControl/cAccessControl.c 2006-01-08 11:21:06 UTC (rev 41204) @@ -658,8 +658,7 @@ static PyObject *Containers = NULL; static PyObject *ContainerAssertions = NULL; static PyObject *Unauthorized = NULL; -static PyObject *LOG = NULL; -static PyObject *PROBLEM = NULL; +static PyObject *warn= NULL; static PyObject *NoSequenceFormat = NULL; static PyObject *_what_not_even_god_should_do = NULL; static PyObject *Anonymous = NULL; @@ -1052,8 +1051,7 @@ m=PyObject_Repr(roles); if (m) ASSIGN(m, Py_BuildValue("OO", m, name)); if (m) ASSIGN(m, PyString_Format(NoSequenceFormat, m)); - if (m) ASSIGN(m, PyObject_CallFunction(LOG, "sOO", - "Zope Security Policy", PROBLEM, m)); + if (m) ASSIGN(m, PyObject_CallFunction(warn, "O", m)); Py_XDECREF(m); PyErr_Restore(t, v, tb); goto err; @@ -2176,7 +2174,7 @@ static PyObject * module_aq_validate(PyObject *ignored, PyObject *args) { - PyObject *inst, *obj, *name, *v, *validate; + PyObject *inst=NULL, *obj=NULL, *name=NULL, *v=NULL, *validate=NULL; if (unpacktuple5(args, "validate", 0, &inst, &obj, &name, &v, &validate) < 0) return NULL; @@ -2331,9 +2329,8 @@ /*| from zLOG import LOG, PROBLEM */ - IMPORT(module, "zLOG"); - GETATTR(module, LOG); - GETATTR(module, PROBLEM); + IMPORT(module, "logger_wrapper"); + GETATTR(module, warn); Py_DECREF(module); module = NULL; } Added: Zope/trunk/lib/python/AccessControl/logger_wrapper.py =================================================================== --- Zope/trunk/lib/python/AccessControl/logger_wrapper.py 2006-01-08 11:08:49 UTC (rev 41203) +++ Zope/trunk/lib/python/AccessControl/logger_wrapper.py 2006-01-08 11:21:06 UTC (rev 41204) @@ -0,0 +1,6 @@ +# A wrapper to replace the usage of the zLOG module in cAccessControl without +# having the need to change the C code significantly. + +from logging import getLogger +LOG = getLogger('AccessControl') +warn = LOG.warn _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins