[Zope3-checkins] CVS: Zope3/src/zope/configuration - meta.py:1.5.12.2 metametaconfigure.py:1.7.4.2 metametaconfigurefordocgen.py:1.5.4.2 xmlconfig.py:1.6.18.2
Albertas Agejevas
alga@codeworks.lt
Mon, 23 Jun 2003 10:21:03 -0400
Update of /cvs-repository/Zope3/src/zope/configuration
In directory cvs.zope.org:/tmp/cvs-serv16963/src/zope/configuration
Modified Files:
Tag: cw-mail-branch
meta.py metametaconfigure.py metametaconfigurefordocgen.py
xmlconfig.py
Log Message:
One more sync with HEAD.
=== Zope3/src/zope/configuration/meta.py 1.5.12.1 => 1.5.12.2 ===
=== Zope3/src/zope/configuration/metametaconfigure.py 1.7.4.1 => 1.7.4.2 ===
=== Zope3/src/zope/configuration/metametaconfigurefordocgen.py 1.5.4.1 => 1.5.4.2 ===
=== Zope3/src/zope/configuration/xmlconfig.py 1.6.18.1 => 1.6.18.2 ===
--- Zope3/src/zope/configuration/xmlconfig.py:1.6.18.1 Sun Jun 22 10:23:38 2003
+++ Zope3/src/zope/configuration/xmlconfig.py Mon Jun 23 10:20:32 2003
@@ -17,6 +17,7 @@
import os
import sys
+import logging
from keyword import iskeyword
from types import StringType
from os.path import abspath
@@ -35,6 +36,8 @@
_NO_MODULE_GIVEN = object()
+logger = logging.getLogger("config")
+
class ZopeXMLConfigurationError(ConfigurationError):
"""Zope XML Configuration error"""
@@ -355,6 +358,7 @@
return ()
def _include(self, file_name, package):
+ logger.debug("include %s" % file_name)
f = open(file_name)
self._stack.append(file_name)
xmlconfig(f, self._actions, Context(self._stack, package),