[Checkins] SVN: GenericSetup/trunk/ Apply r78768 to the trunk, updated version number

[Hanno Schlichting]

Log message for revision 78772:
  Apply r78768 to the trunk, updated version number
  

Changed:
  U   GenericSetup/trunk/CHANGES.txt
  U   GenericSetup/trunk/components.py
  U   GenericSetup/trunk/version.txt

-=-
Modified: GenericSetup/trunk/CHANGES.txt
===================================================================
--- GenericSetup/trunk/CHANGES.txt	2007-08-12 12:29:58 UTC (rev 78771)
+++ GenericSetup/trunk/CHANGES.txt	2007-08-12 12:30:50 UTC (rev 78772)
@@ -1,8 +1,15 @@
 GenericSetup Product Changelog
 
 
-  GenericSetup 1.3.1 (unreleased)
+  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
       empty string.
 

Modified: GenericSetup/trunk/components.py
===================================================================
--- GenericSetup/trunk/components.py	2007-08-12 12:29:58 UTC (rev 78771)
+++ GenericSetup/trunk/components.py	2007-08-12 12:30:50 UTC (rev 78772)
@@ -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:

Modified: GenericSetup/trunk/version.txt
===================================================================
--- GenericSetup/trunk/version.txt	2007-08-12 12:29:58 UTC (rev 78771)
+++ GenericSetup/trunk/version.txt	2007-08-12 12:30:50 UTC (rev 78772)
@@ -1 +1 @@
-GenericSetup-1.2beta
+GenericSetup-1.4beta