[Zope3-checkins] CVS: Zope3/lib/python/Zope/Configuration - meta.py:1.13

[R. David Murray]

Update of /cvs-repository/Zope3/lib/python/Zope/Configuration
In directory cvs.zope.org:/tmp/cvs-serv1839

Modified Files:
	meta.py 
Log Message:
Renable some disabled tests in testDirectivesXML of Zope/Configuration
(they pass, so I'm not sure why they were disabled).  Enhance one
of them (SimpleComplexDirective) to actually test the calling of
the subdirective rather than just the defining of it.  Add a test
of the directive directve.

Add a test of a subdirective having subdirectives.  This test
exercises a bug:  the Subdirective returned by the subdirective
method on Subdirective didn't get passed a namespace, leading to
an InvalidDirectiveDefinition error when you tried to define the
sub-subdirective.

Fixed the bug.


=== Zope3/lib/python/Zope/Configuration/meta.py 1.12 => 1.13 ===
--- Zope3/lib/python/Zope/Configuration/meta.py:1.12	Thu Sep 19 11:09:58 2002
+++ Zope3/lib/python/Zope/Configuration/meta.py	Sun Sep 22 12:05:18 2002
@@ -313,7 +313,7 @@
             raise InvalidDirectiveDefinition(name)
         #If handler_method is None, registersub will use name.
         subs = registersub(self._subs, (namespace, name), handler_method)
-        return Subdirective(subs)
+        return Subdirective(subs,namespace=namespace)
 
     def __call__(self):
         return ()