[Checkins] SVN: zope.container/trunk/ fixed zcml-related tests and dependencies

[Thomas Lotze]

Log message for revision 116636:
  fixed zcml-related tests and dependencies

Changed:
  U   zope.container/trunk/CHANGES.txt
  U   zope.container/trunk/setup.py
  U   zope.container/trunk/src/zope/container/configure.zcml
  D   zope.container/trunk/src/zope/container/tests/ftest_zcml_dependencies.zcml
  U   zope.container/trunk/src/zope/container/tests/test_dependencies.py

-=-
Modified: zope.container/trunk/CHANGES.txt
===================================================================
--- zope.container/trunk/CHANGES.txt	2010-09-19 12:16:13 UTC (rev 116635)
+++ zope.container/trunk/CHANGES.txt	2010-09-19 12:26:18 UTC (rev 116636)
@@ -8,6 +8,8 @@
 - Fix detection of moving folders into itself or a subfolder of itself.
   (#118088)
 
+- Fixed ZCML-related tests and dependencies.
+
 3.11.1 (2010-04-30)
 -------------------
 

Modified: zope.container/trunk/setup.py
===================================================================
--- zope.container/trunk/setup.py	2010-09-19 12:16:13 UTC (rev 116635)
+++ zope.container/trunk/setup.py	2010-09-19 12:26:18 UTC (rev 116636)
@@ -62,16 +62,16 @@
                    ],
       extras_require=dict(
           test=['zope.configuration',
-                'zope.security',
+                'zope.testing',
                 ]),
       install_requires=['setuptools',
                         'zope.interface',
                         'zope.dottedname',
                         'zope.schema',
-                        'zope.component',
+                        'zope.component[zcml]',
                         'zope.event',
                         'zope.location>=3.5.4',
-                        'zope.security',
+                        'zope.security[zcml]>=3.8.0dev',
                         'zope.lifecycleevent>=3.5.2',
                         'zope.i18nmessageid',
                         'zope.filerepresentation',

Modified: zope.container/trunk/src/zope/container/configure.zcml
===================================================================
--- zope.container/trunk/src/zope/container/configure.zcml	2010-09-19 12:16:13 UTC (rev 116635)
+++ zope.container/trunk/src/zope/container/configure.zcml	2010-09-19 12:26:18 UTC (rev 116636)
@@ -3,6 +3,10 @@
    i18n_domain="zope"
    >
 
+  <include file="meta.zcml" package="zope.component" />
+  <include file="meta.zcml" package="zope.security" />
+  <include file="permissions.zcml" package="zope.security" />
+
   <adapter
      provides=".interfaces.IFind"
      for=".interfaces.IReadContainer"

Deleted: zope.container/trunk/src/zope/container/tests/ftest_zcml_dependencies.zcml
===================================================================
--- zope.container/trunk/src/zope/container/tests/ftest_zcml_dependencies.zcml	2010-09-19 12:16:13 UTC (rev 116635)
+++ zope.container/trunk/src/zope/container/tests/ftest_zcml_dependencies.zcml	2010-09-19 12:26:18 UTC (rev 116636)
@@ -1,10 +0,0 @@
-<configure
-    xmlns="http://namespaces.zope.org/zope">
-
-    <include package="zope.component" file="meta.zcml"/>
-    <include package="zope.security" file="meta.zcml" />
-    <include package="zope.security" file="permissions.zcml" />
-
-    <include package="zope.container"/>
-
-</configure>

Modified: zope.container/trunk/src/zope/container/tests/test_dependencies.py
===================================================================
--- zope.container/trunk/src/zope/container/tests/test_dependencies.py	2010-09-19 12:16:13 UTC (rev 116635)
+++ zope.container/trunk/src/zope/container/tests/test_dependencies.py	2010-09-19 12:26:18 UTC (rev 116636)
@@ -13,17 +13,10 @@
 
 class ZCMLDependencies(ContainerPlacelessSetup, unittest.TestCase):
 
-    def test_zcml_can_load_with_only_zope_component_meta(self):
+    def test_zcml_can_load(self):
         # this is just an example.  It is supposed to show that the
         # configure.zcml file has loaded successfully.
 
-        import zope.component
-        XMLConfig('meta.zcml', zope.component)()
-
-        import zope.security
-        XMLConfig('meta.zcml', zope.security)()
-        XMLConfig('permissions.zcml', zope.security)()
-
         import zope.container
         XMLConfig('configure.zcml', zope.container)()