[Zope3-checkins] CVS: Zope3/src/zope/configuration - metametaconfigure.py:1.6.6.1 metametaconfigurefordocgen.py:1.4.20.1

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/configuration
In directory cvs.zope.org:/tmp/cvs-serv8709/src/zope/configuration

Modified Files:
      Tag: interfacegeddon2-branch
	metametaconfigure.py metametaconfigurefordocgen.py 
Log Message:
Merged interfacegeddon changes into second interfacegeddon branch in
preparation for the final merge.


=== Zope3/src/zope/configuration/metametaconfigure.py 1.6 => 1.6.6.1 ===
--- Zope3/src/zope/configuration/metametaconfigure.py:1.6	Thu May  1 15:35:39 2003
+++ Zope3/src/zope/configuration/metametaconfigure.py	Fri May  2 15:42:52 2003
@@ -14,7 +14,7 @@
 """
 $Id$
 """
-from zope.interface import directlyProvides
+from zope.interface import directlyProvides, classProvides
 from zope.configuration.meta \
      import DirectiveNamespace as bootstrapDirectiveNamespace
 from zope.configuration.meta import Subdirective as bootstrapSubdirective
@@ -28,7 +28,7 @@
 
 class DirectiveNamespace(bootstrapDirectiveNamespace):
 
-    __class_implements_ = INonEmptyDirective
+    classProvides(INonEmptyDirective)
     __implements__ = ISubdirectiveHandler
 
     def _Subdirective(self, *args, **kw):


=== Zope3/src/zope/configuration/metametaconfigurefordocgen.py 1.4 => 1.4.20.1 ===
--- Zope3/src/zope/configuration/metametaconfigurefordocgen.py:1.4	Mon Dec 30 21:52:10 2002
+++ Zope3/src/zope/configuration/metametaconfigurefordocgen.py	Fri May  2 15:42:52 2003
@@ -14,8 +14,11 @@
 """
 $Id$
 """
-from zope.configuration.metametaconfigure import DirectiveNamespace as baseDirectiveNamespace
-from zope.configuration.metametaconfigure import Subdirective as baseSubdirective
+from zope.interface import classProvides
+from zope.configuration.metametaconfigure \
+     import DirectiveNamespace as baseDirectiveNamespace
+from zope.configuration.metametaconfigure \
+     import Subdirective as baseSubdirective
 from zope.configuration.interfaces import INonEmptyDirective
 from zope.configuration.interfaces import ISubdirectiveHandler
 
@@ -76,7 +79,7 @@
 class DirectiveNamespace(baseDirectiveNamespace):
     """An extended class that handles descriptions and attributes"""
 
-    __class_implements_ = INonEmptyDirective
+    classProvides(INonEmptyDirective)
     __implements__ = ISubdirectiveHandler
 
     def _Subdirective(self, *args, **kw):