[Checkins] SVN: Products.CMFUid/branches/2.2/Products/CMFUid/ Backport c113185 from trunk

Hanno Schlichting hannosch at hannosch.eu
Sun Jun 6 09:44:20 EDT 2010


Log message for revision 113195:
  Backport c113185 from trunk
  

Changed:
  U   Products.CMFUid/branches/2.2/Products/CMFUid/CHANGES.txt
  U   Products.CMFUid/branches/2.2/Products/CMFUid/testing.py

-=-
Modified: Products.CMFUid/branches/2.2/Products/CMFUid/CHANGES.txt
===================================================================
--- Products.CMFUid/branches/2.2/Products/CMFUid/CHANGES.txt	2010-06-06 13:42:47 UTC (rev 113194)
+++ Products.CMFUid/branches/2.2/Products/CMFUid/CHANGES.txt	2010-06-06 13:44:20 UTC (rev 113195)
@@ -4,8 +4,11 @@
 2.2.1-beta (unreleased)
 -----------------------
 
+- Deal with deprecation warnings for Zope 2.13.
+
 - Fix markup error (Chameleon compatibility)
 
+
 2.2.0 (2010-01-04)
 ------------------
 

Modified: Products.CMFUid/branches/2.2/Products/CMFUid/testing.py
===================================================================
--- Products.CMFUid/branches/2.2/Products/CMFUid/testing.py	2010-06-06 13:42:47 UTC (rev 113194)
+++ Products.CMFUid/branches/2.2/Products/CMFUid/testing.py	2010-06-06 13:44:20 UTC (rev 113195)
@@ -1,9 +1,14 @@
 from Testing.ZopeTestCase.layer import ZopeLite
 from zope.site.hooks import setHooks
 from zope.testing.cleanup import cleanUp
-from Products.Five import zcml
 
+# BBB for Zope 2.12
+try:
+    from Zope2.App import zcml
+except ImportError:
+    from Products.Five import zcml
 
+
 class UidEventZCMLLayer(ZopeLite):
 
     @classmethod



More information about the checkins mailing list