[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/Publisher/Browser - GlobalBrowserMenuService.py:1.6 I18nResourceMeta.py:1.3 ResourceMeta.py:1.5 ViewMeta.py:1.7

[R. David Murray]

Update of /cvs-repository/Zope3/lib/python/Zope/App/Publisher/Browser
In directory cvs.zope.org:/tmp/cvs-serv10913/lib/python/Zope/App/Publisher/Browser

Modified Files:
	GlobalBrowserMenuService.py I18nResourceMeta.py 
	ResourceMeta.py ViewMeta.py 
Log Message:
Merge of rdmurray-metameta-branch.  See checkin message for 
doc/zcml/meta.stx for a more comprehensive checkin comment.


=== Zope3/lib/python/Zope/App/Publisher/Browser/GlobalBrowserMenuService.py 1.5 => 1.6 ===
--- Zope3/lib/python/Zope/App/Publisher/Browser/GlobalBrowserMenuService.py:1.5	Tue Oct  1 08:49:08 2002
+++ Zope3/lib/python/Zope/App/Publisher/Browser/GlobalBrowserMenuService.py	Wed Nov  6 17:30:21 2002
@@ -13,6 +13,8 @@
 ##############################################################################
 
 from IBrowserMenuService import IBrowserMenuService
+from Zope.Configuration.INonEmptyDirective import INonEmptyDirective
+from Zope.Configuration.ISubdirectiveHandler import ISubdirectiveHandler
 from Zope.Configuration.Action import Action
 from Interface.Registry.TypeRegistry import TypeRegistry
 from Zope.Exceptions import DuplicationError, Unauthorized, Forbidden
@@ -116,6 +118,9 @@
 
     
 class menuItemsDirective:
+
+    __class_implements__ = INonEmptyDirective
+    __implements__ = ISubdirectiveHandler
 
     def __init__(self, _context, menu, for_):
         self.menu = menu


=== Zope3/lib/python/Zope/App/Publisher/Browser/I18nResourceMeta.py 1.2 => 1.3 ===
--- Zope3/lib/python/Zope/App/Publisher/Browser/I18nResourceMeta.py:1.2	Tue Jun 25 10:44:51 2002
+++ Zope3/lib/python/Zope/App/Publisher/Browser/I18nResourceMeta.py	Wed Nov  6 17:30:21 2002
@@ -20,6 +20,8 @@
 from Zope.Security.Checker \
      import CheckerPublic, NamesChecker, Checker
 
+from Zope.Configuration.ISubdirectiveHandler import ISubdirectiveHandler
+from Zope.Configuration.INonEmptyDirective import INonEmptyDirective
 from Zope.Configuration.Action import Action
 from Zope.Configuration.Exceptions import ConfigurationError
 
@@ -32,6 +34,9 @@
      import I18nFileResourceFactory
 
 class I18nResource(object):
+
+    __class_implements__ = INonEmptyDirective
+    __implements__ = ISubdirectiveHandler
 
     type = IBrowserPresentation
     default_allowed_attributes = '__call__'


=== Zope3/lib/python/Zope/App/Publisher/Browser/ResourceMeta.py 1.4 => 1.5 ===
--- Zope3/lib/python/Zope/App/Publisher/Browser/ResourceMeta.py:1.4	Mon Oct 28 06:57:13 2002
+++ Zope3/lib/python/Zope/App/Publisher/Browser/ResourceMeta.py	Wed Nov  6 17:30:21 2002
@@ -20,6 +20,8 @@
 from Zope.Security.Checker \
      import CheckerPublic, NamesChecker, Checker
 
+from Zope.Configuration.INonEmptyDirective import INonEmptyDirective
+from Zope.Configuration.ISubdirectiveHandler import ISubdirectiveHandler
 from Zope.Configuration.Action import Action
 from Zope.Configuration.Exceptions import ConfigurationError
 
@@ -31,6 +33,9 @@
      import FileResourceFactory, ImageResourceFactory
 
 class resource(object):
+
+    __class_implements__ = INonEmptyDirective
+    __implements__ = ISubdirectiveHandler
 
     type = IBrowserPresentation
     default_allowed_attributes = '__call__'  # space separated string


=== Zope3/lib/python/Zope/App/Publisher/Browser/ViewMeta.py 1.6 => 1.7 ===
--- Zope3/lib/python/Zope/App/Publisher/Browser/ViewMeta.py:1.6	Mon Oct 28 13:41:18 2002
+++ Zope3/lib/python/Zope/App/Publisher/Browser/ViewMeta.py	Wed Nov  6 17:30:21 2002
@@ -22,6 +22,8 @@
 from Zope.Security.Checker \
      import CheckerPublic, NamesChecker, Checker
 
+from Zope.Configuration.INonEmptyDirective import INonEmptyDirective
+from Zope.Configuration.ISubdirectiveHandler import ISubdirectiveHandler
 from Zope.Configuration.Action import Action
 from Zope.Configuration.Exceptions import ConfigurationError
 
@@ -38,6 +40,9 @@
 from ResourceMeta import resource
 
 class view(resource):
+
+    __class_implements__ = INonEmptyDirective
+    __implements__ = ISubdirectiveHandler
 
     __pages = None
     __default = None