[Checkins] SVN: GenericSetup/trunk/ - Guard against situations where encoded text may be compared by the

[Jens Vagelpohl]

Log message for revision 76500:
  - Guard against situations where encoded text may be compared by the
    differ.
    (http://www.zope.org/Collectors/CMF/471)
  

Changed:
  U   GenericSetup/trunk/CHANGES.txt
  U   GenericSetup/trunk/differ.py

-=-
Modified: GenericSetup/trunk/CHANGES.txt
===================================================================
--- GenericSetup/trunk/CHANGES.txt	2007-06-08 14:28:21 UTC (rev 76499)
+++ GenericSetup/trunk/CHANGES.txt	2007-06-08 15:01:44 UTC (rev 76500)
@@ -2,6 +2,10 @@
 
   GenericSetup 1.3-beta (unreleased)
 
+    - Guard against situations where encoded text may be compared by the
+      differ.
+      (http://www.zope.org/Collectors/CMF/471)
+
     - Extend the ZCatalog import/export mechanism to allow removal of 
       metadata columns in addition to adding them.
       (http://www.zope.org/Collectors/CMF/483)

Modified: GenericSetup/trunk/differ.py
===================================================================
--- GenericSetup/trunk/differ.py	2007-06-08 14:28:21 UTC (rev 76499)
+++ GenericSetup/trunk/differ.py	2007-06-08 15:01:44 UTC (rev 76500)
@@ -226,6 +226,6 @@
 
     security.declarePrivate( 'compare' )
     def compare( self ):
-        return '\n'.join( self.compareDirectories() )
+        return '\n'.join( [str(line) for line in self.compareDirectories()] )
 
 InitializeClass( ConfigDiff )