[Checkins] SVN: GenericSetup/tags/1.3.1/ Revert accidental changes to a tag

[Hanno Schlichting]

Log message for revision 78769:
  Revert accidental changes to a tag
  

Changed:
  U   GenericSetup/tags/1.3.1/CHANGES.txt
  U   GenericSetup/tags/1.3.1/components.py

-=-
Modified: GenericSetup/tags/1.3.1/CHANGES.txt
===================================================================
--- GenericSetup/tags/1.3.1/CHANGES.txt	2007-08-12 12:20:10 UTC (rev 78768)
+++ GenericSetup/tags/1.3.1/CHANGES.txt	2007-08-12 12:22:02 UTC (rev 78769)
@@ -1,12 +1,6 @@
 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/tags/1.3.1/components.py
===================================================================
--- GenericSetup/tags/1.3.1/components.py	2007-08-12 12:20:10 UTC (rev 78768)
+++ GenericSetup/tags/1.3.1/components.py	2007-08-12 12:22:02 UTC (rev 78769)
@@ -28,6 +28,8 @@
 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
 
@@ -64,9 +66,7 @@
     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"
-                                         % (repr(obj), obj_path, repr(site)))
+                                         % (path, obj_path, repr(site)))
             elif component:
                 self.context.registerUtility(component, provided, name)
             elif factory is not None: