[Checkins] SVN: Products.GenericSetup/trunk/Products/GenericSetup/ Squish another Products.Five:traversal.zcml use.

[Tres Seaver]

Log message for revision 102486:
  Squish another Products.Five:traversal.zcml use.

Changed:
  U   Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt
  U   Products.GenericSetup/trunk/Products/GenericSetup/testing.py

-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt	2009-08-04 13:47:08 UTC (rev 102485)
+++ Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt	2009-08-04 13:48:58 UTC (rev 102486)
@@ -4,6 +4,9 @@
 GenericSetup 1.5.0 (unreleased)
 -------------------------------
 
+- Changed testing.py to directly load zope.traversing's ZCML instead of going
+  via the Five traversing.zcml BBB shim.
+
 - Added new feature to the component handler. For factory based utilities you
   can now specify an additional id. All factory based utilities will now by
   default be added to the site manager (being an ObjectManager itself) as an

Modified: Products.GenericSetup/trunk/Products/GenericSetup/testing.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/testing.py	2009-08-04 13:47:08 UTC (rev 102485)
+++ Products.GenericSetup/trunk/Products/GenericSetup/testing.py	2009-08-04 13:48:58 UTC (rev 102486)
@@ -148,11 +148,12 @@
         import Products.Five
         from Products.Five import zcml
         import Products.GenericSetup
+        import zope.traversing
 
         zcml.load_config('meta.zcml', Products.Five)
         zcml.load_config('meta.zcml', Products.GenericSetup)
         zcml.load_config('permissions.zcml', Products.Five)
-        zcml.load_config('traversing.zcml', Products.Five)
+        zcml.load_config('configure.zcml', zope.traversing)
         zcml.load_config('configure.zcml', Products.GenericSetup)
 
     @classmethod