[Checkins] SVN: Products.CMFUid/trunk/ - require at least Zope 2.13.4

[Yvo Schubbe]

Log message for revision 120436:
  - require at least Zope 2.13.4

Changed:
  U   Products.CMFUid/trunk/Products/CMFUid/CHANGES.txt
  UU  Products.CMFUid/trunk/Products/CMFUid/testing.py
  U   Products.CMFUid/trunk/setup.py

-=-
Modified: Products.CMFUid/trunk/Products/CMFUid/CHANGES.txt
===================================================================
--- Products.CMFUid/trunk/Products/CMFUid/CHANGES.txt	2011-02-19 10:06:24 UTC (rev 120435)
+++ Products.CMFUid/trunk/Products/CMFUid/CHANGES.txt	2011-02-19 10:06:36 UTC (rev 120436)
@@ -4,6 +4,8 @@
 2.3.0-alpha (unreleased)
 ------------------------
 
+- Require at least Zope 2.13.4.
+
 - Deal with deprecation warnings for Zope 2.13.
 
 - Fix markup error (Chameleon compatibility)

Modified: Products.CMFUid/trunk/Products/CMFUid/testing.py
===================================================================
--- Products.CMFUid/trunk/Products/CMFUid/testing.py	2011-02-19 10:06:24 UTC (rev 120435)
+++ Products.CMFUid/trunk/Products/CMFUid/testing.py	2011-02-19 10:06:36 UTC (rev 120436)
@@ -1,14 +1,24 @@
+##############################################################################
+#
+# Copyright (c) 2007 Zope Foundation and Contributors.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+""" Unit test layers.
+"""
+
 from Testing.ZopeTestCase.layer import ZopeLite
 from zope.site.hooks import setHooks
 from zope.testing.cleanup import cleanUp
+from Zope2.App import zcml
 
-# BBB for Zope 2.12
-try:
-    from Zope2.App import zcml
-except ImportError:
-    from Products.Five import zcml
 
-
 class UidEventZCMLLayer(ZopeLite):
 
     @classmethod


Property changes on: Products.CMFUid/trunk/Products/CMFUid/testing.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: Products.CMFUid/trunk/setup.py
===================================================================
--- Products.CMFUid/trunk/setup.py	2011-02-19 10:06:24 UTC (rev 120435)
+++ Products.CMFUid/trunk/setup.py	2011-02-19 10:06:36 UTC (rev 120436)
@@ -46,7 +46,7 @@
                      ],
       install_requires=[
           'setuptools',
-          'Zope2 >= 2.12.0',
+          'Zope2 >= 2.13.4',
           'Products.CMFCore',
           'Products.GenericSetup',
           ],