[z3-checkins] r28827 - in z3/jsonserver/branch/merge/configfeature: . tests

[reebalazs at codespeak.net]

Author: reebalazs
Date: Thu Jun 15 17:04:08 2006
New Revision: 28827

Added:
   z3/jsonserver/branch/merge/configfeature/metacore.zcml
Modified:
   z3/jsonserver/branch/merge/configfeature/configure.zcml
   z3/jsonserver/branch/merge/configfeature/meta.zcml
   z3/jsonserver/branch/merge/configfeature/tests/test_directive.py
   z3/jsonserver/branch/merge/configfeature/tests/test_fiveconfig.py
Log:
Small fixes

Modified: z3/jsonserver/branch/merge/configfeature/configure.zcml
==============================================================================
--- z3/jsonserver/branch/merge/configfeature/configure.zcml	(original)
+++ z3/jsonserver/branch/merge/configfeature/configure.zcml	Thu Jun 15 17:04:08 2006
@@ -1,7 +1,4 @@
 <configure xmlns="http://namespaces.zope.org/zope"
            i18n_domain="zope">
 
-    <!-- Define Five compatibility features -->
-    <include file="fiveconfig.zcml" />
-
 </configure>

Modified: z3/jsonserver/branch/merge/configfeature/meta.zcml
==============================================================================
--- z3/jsonserver/branch/merge/configfeature/meta.zcml	(original)
+++ z3/jsonserver/branch/merge/configfeature/meta.zcml	Thu Jun 15 17:04:08 2006
@@ -2,14 +2,9 @@
            xmlns:meta="http://namespaces.zope.org/meta"
            i18n_domain="zope">
 
-    <meta:directives namespace="http://namespaces.zope.org/five">
+    <include file="metacore.zcml" />
 
-    <meta:directive
-        name="configfeature"
-        schema=".directives.IConfigFeature"
-        handler=".meta.configfeature"
-        />
-
-  </meta:directives>
+    <!-- Define Five compatibility features -->
+    <include file="fiveconfig.zcml" />
 
 </configure>

Added: z3/jsonserver/branch/merge/configfeature/metacore.zcml
==============================================================================
--- (empty file)
+++ z3/jsonserver/branch/merge/configfeature/metacore.zcml	Thu Jun 15 17:04:08 2006
@@ -0,0 +1,15 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+           xmlns:meta="http://namespaces.zope.org/meta"
+           i18n_domain="zope">
+
+    <meta:directives namespace="http://namespaces.zope.org/five">
+
+    <meta:directive
+        name="configfeature"
+        schema=".directives.IConfigFeature"
+        handler=".meta.configfeature"
+        />
+
+  </meta:directives>
+
+</configure>

Modified: z3/jsonserver/branch/merge/configfeature/tests/test_directive.py
==============================================================================
--- z3/jsonserver/branch/merge/configfeature/tests/test_directive.py	(original)
+++ z3/jsonserver/branch/merge/configfeature/tests/test_directive.py	Thu Jun 15 17:04:08 2006
@@ -11,7 +11,7 @@
 
     >>> import zope.configuration.tests
     >>> import zope.configuration.xmlconfig
-    >>> context = zope.configuration.xmlconfig.file('meta.zcml', configfeature)
+    >>> context = zope.configuration.xmlconfig.file('metacore.zcml', configfeature)
 
     >>> import tempfile
     >>> fn = tempfile.mktemp('.zcml')
@@ -57,7 +57,7 @@
 
     >>> import zope.configuration.tests
     >>> import zope.configuration.xmlconfig
-    >>> context = zope.configuration.xmlconfig.file('meta.zcml', configfeature)
+    >>> context = zope.configuration.xmlconfig.file('metacore.zcml', configfeature)
 
     >>> import tempfile
     >>> fn = tempfile.mktemp('.zcml')
@@ -103,7 +103,7 @@
 
     >>> import zope.configuration.tests
     >>> import zope.configuration.xmlconfig
-    >>> context = zope.configuration.xmlconfig.file('meta.zcml', configfeature)
+    >>> context = zope.configuration.xmlconfig.file('metacore.zcml', configfeature)
 
     >>> import tempfile
     >>> fn = tempfile.mktemp('.zcml')
@@ -149,7 +149,7 @@
 
     >>> import zope.configuration.tests
     >>> import zope.configuration.xmlconfig
-    >>> context = zope.configuration.xmlconfig.file('meta.zcml', configfeature)
+    >>> context = zope.configuration.xmlconfig.file('metacore.zcml', configfeature)
 
     No such instance: raises an error.
 

Modified: z3/jsonserver/branch/merge/configfeature/tests/test_fiveconfig.py
==============================================================================
--- z3/jsonserver/branch/merge/configfeature/tests/test_fiveconfig.py	(original)
+++ z3/jsonserver/branch/merge/configfeature/tests/test_fiveconfig.py	Thu Jun 15 17:04:08 2006
@@ -12,8 +12,12 @@
 
     >>> import zope.configuration.tests
     >>> import zope.configuration.xmlconfig
-    >>> context = zope.configuration.xmlconfig.file('meta.zcml', configfeature)
+    >>> context = zope.configuration.xmlconfig.file('metacore.zcml', configfeature)
     >>> context = zope.configuration.xmlconfig.file('fiveconfig.zcml', configfeature, context)
+    
+    >>> context.hasFeature('compat_five') or context.hasFeature('compat_not_five')
+    True
+
     """