[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ Fixed compatibility with non-string execeptoins on Zope trunk.

[Tres Seaver]

Log message for revision 92634:
  Fixed compatibility with non-string execeptoins on Zope trunk.
  

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
  U   Products.CMFCore/trunk/Products/CMFCore/tests/test_PortalFolder.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2008-10-27 20:55:59 UTC (rev 92633)
+++ Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2008-10-27 21:11:25 UTC (rev 92634)
@@ -4,6 +4,8 @@
 2.2.0 (unreleased)
 ------------------
 
+- Fixed compatibility with non-string execeptoins on Zope trunk.
+
 - Added remove support to GenericSetup types tool exportimport handler.
 
 - FiveActionsTool: Removed the tool and all functionality for bridging

Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_PortalFolder.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_PortalFolder.py	2008-10-27 20:55:59 UTC (rev 92633)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_PortalFolder.py	2008-10-27 21:11:25 UTC (rev 92634)
@@ -876,7 +876,7 @@
             if ce_regex is not None:
 
                 pattern = re.compile( ce_regex, re.DOTALL )
-                if pattern.search( e ) is None:
+                if pattern.search(str(e)) is None:
                     self.fail( "Paste failed; didn't match pattern:\n%s" % e )
 
             else: