[Checkins] SVN: Products.GenericSetup/trunk/ Deal with deprecation warnings for Zope 2.13.

[Hanno Schlichting]

Log message for revision 113187:
  Deal with deprecation warnings for Zope 2.13.
  

Changed:
  U   Products.GenericSetup/trunk/Products/GenericSetup/testing.py
  U   Products.GenericSetup/trunk/Products/GenericSetup/tests/test_stepzcml.py
  U   Products.GenericSetup/trunk/Products/GenericSetup/tests/test_zcml.py
  U   Products.GenericSetup/trunk/docs/CHANGES.rst

-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/testing.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/testing.py	2010-06-06 13:23:20 UTC (rev 113186)
+++ Products.GenericSetup/trunk/Products/GenericSetup/testing.py	2010-06-06 13:30:12 UTC (rev 113187)
@@ -144,11 +144,16 @@
         import Zope2.App
         import AccessControl
         import Products.Five
-        from Products.Five import zcml
         import Products.GenericSetup
         import zope.traversing
 
+        # BBB for Zope 2.12
         try:
+            from Zope2.App import zcml
+        except ImportError:
+            from Products.Five import zcml
+
+        try:
             zcml.load_config('meta.zcml', Zope2.App)
         except IOError:  # Zope <= 2.12.x
             pass

Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_stepzcml.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/test_stepzcml.py	2010-06-06 13:23:20 UTC (rev 113186)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_stepzcml.py	2010-06-06 13:30:12 UTC (rev 113187)
@@ -20,8 +20,14 @@
 
 import Products.GenericSetup
 from Products.GenericSetup.registry import _import_step_registry
-from Products.Five import zcml
 
+# BBB for Zope 2.12
+try:
+    from Zope2.App import zcml
+except ImportError:
+    from Products.Five import zcml
+
+
 EMPTY_ZCML = '''<configure xmlns:genericsetup="http://namespaces.zope.org/genericsetup">
 </configure>'''
 

Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_zcml.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/test_zcml.py	2010-06-06 13:23:20 UTC (rev 113186)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_zcml.py	2010-06-06 13:30:12 UTC (rev 113187)
@@ -16,15 +16,20 @@
 """
 
 import unittest
-import Testing
 from zope.testing import doctest
 from zope.testing.doctest import ELLIPSIS
 from zope.testing.cleanup import cleanUp
 
 from Products.GenericSetup.registry import _import_step_registry
 from Products.GenericSetup.registry import _export_step_registry
-from Products.Five import zcml
 
+# BBB for Zope 2.12
+try:
+    from Zope2.App import zcml
+except ImportError:
+    from Products.Five import zcml
+
+
 def dummy_importstep_handler(context):
     pass
 
@@ -45,7 +50,6 @@
     Use the genericsetup:registerProfile directive::
 
       >>> import Products.GenericSetup
-      >>> from Products.Five import zcml
       >>> configure_zcml = '''
       ... <configure
       ...     xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
@@ -95,7 +99,6 @@
     Use the genericsetup:registerProfile directive::
 
       >>> import Products.GenericSetup
-      >>> from Products.Five import zcml
       >>> configure_zcml = '''
       ... <configure
       ...     xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
@@ -148,7 +151,6 @@
     Use the standalone genericsetup:upgradeStep directive::
 
       >>> import Products.GenericSetup
-      >>> from Products.Five import zcml
       >>> configure_zcml = '''
       ... <configure
       ...     xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
@@ -192,7 +194,6 @@
     Use the standalone genericsetup:upgradeDepends directive::
 
       >>> import Products.GenericSetup
-      >>> from Products.Five import zcml
       >>> configure_zcml = '''
       ... <configure
       ...     xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
@@ -239,7 +240,6 @@
     Use the nested genericsetup:upgradeSteps directive::
 
       >>> import Products.GenericSetup
-      >>> from Products.Five import zcml
       >>> configure_zcml = '''
       ... <configure
       ...     xmlns:genericsetup="http://namespaces.zope.org/genericsetup"

Modified: Products.GenericSetup/trunk/docs/CHANGES.rst
===================================================================
--- Products.GenericSetup/trunk/docs/CHANGES.rst	2010-06-06 13:23:20 UTC (rev 113186)
+++ Products.GenericSetup/trunk/docs/CHANGES.rst	2010-06-06 13:30:12 UTC (rev 113187)
@@ -4,8 +4,10 @@
 1.6.1 (unreleased)
 ------------------
 
+- Deal with deprecation warnings for Zope 2.13.
+
 - Fixed bug which broke the took upgrade tab after running an upgrade step
-  which used ``None`` as its destintaion version. 
+  which used ``None`` as its destination version. 
   https://bugs.launchpad.net/bugs/553338