[Checkins] SVN: GenericSetup/branches/1.3/ Apply r78768 to the
branch
Hanno Schlichting
plone at hannosch.info
Sun Aug 12 08:24:32 EDT 2007
Log message for revision 78770:
Apply r78768 to the branch
Changed:
U GenericSetup/branches/1.3/CHANGES.txt
U GenericSetup/branches/1.3/components.py
-=-
Modified: GenericSetup/branches/1.3/CHANGES.txt
===================================================================
--- GenericSetup/branches/1.3/CHANGES.txt 2007-08-12 12:22:02 UTC (rev 78769)
+++ GenericSetup/branches/1.3/CHANGES.txt 2007-08-12 12:24:32 UTC (rev 78770)
@@ -1,6 +1,12 @@
GenericSetup Product Changelog
+ GenericSetup 1.3.2 (unreleased)
+
+ - components: Provide log output when purging utilities or adapters.
+
+ - components: Fixed an undefined variable name in a log message.
+
GenericSetup 1.3.1 (2007/08/08)
- components: correct the object path for the site root to be the
Modified: GenericSetup/branches/1.3/components.py
===================================================================
--- GenericSetup/branches/1.3/components.py 2007-08-12 12:22:02 UTC (rev 78769)
+++ GenericSetup/branches/1.3/components.py 2007-08-12 12:24:32 UTC (rev 78770)
@@ -28,8 +28,6 @@
from interfaces import IBody
from interfaces import ISetupEnviron
from utils import XMLAdapterBase
-from utils import exportObjects
-from utils import importObjects
from utils import _getDottedName
from utils import _resolveDottedName
@@ -66,7 +64,9 @@
def _importNode(self, node):
if self.environ.shouldPurge():
self._purgeAdapters()
+ self._logger.info('Adapters purged.')
self._purgeUtilities()
+ self._logger.info('Utilities purged.')
for child in node.childNodes:
if child.nodeName == 'adapters':
@@ -159,7 +159,7 @@
"trying to register an utility. The "
"provided object definition was %s. "
"The site used was: %s"
- % (path, obj_path, repr(site)))
+ % (repr(obj), obj_path, repr(site)))
elif component:
self.context.registerUtility(component, provided, name)
elif factory is not None:
More information about the Checkins
mailing list