[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/Publisher/Browser - GlobalBrowserMenuService.py:1.5.4.1 I18nResourceMeta.py:1.2.4.1 ResourceMeta.py:1.3.4.1 ViewMeta.py:1.4.4.1

[R. David Murray]

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

Modified Files:
      Tag: rdmurray-metameta-branch
	GlobalBrowserMenuService.py I18nResourceMeta.py 
	ResourceMeta.py ViewMeta.py 
Log Message:
Fix the Interface declarations of the INonEmptyDirectives.  Ideally we ought
to properly declare the IEmptyDirectives, too, but if we consider that
the default case it saves a lot of annoying and somewhat ugly declarations.


=== Zope3/lib/python/Zope/App/Publisher/Browser/GlobalBrowserMenuService.py 1.5 => 1.5.4.1 ===
--- 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	Mon Oct 21 19:18:28 2002
@@ -13,6 +13,7 @@
 ##############################################################################
 
 from IBrowserMenuService import IBrowserMenuService
+from Zope.Configuration.INonEmptyDirective import INonEmptyDirective
 from Zope.Configuration.Action import Action
 from Interface.Registry.TypeRegistry import TypeRegistry
 from Zope.Exceptions import DuplicationError, Unauthorized, Forbidden
@@ -116,6 +117,8 @@
 
     
 class menuItemsDirective:
+
+    __class_implements__ = INonEmptyDirective
 
     def __init__(self, _context, menu, for_):
         self.menu = menu


=== Zope3/lib/python/Zope/App/Publisher/Browser/I18nResourceMeta.py 1.2 => 1.2.4.1 ===
--- 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	Mon Oct 21 19:18:28 2002
@@ -20,6 +20,7 @@
 from Zope.Security.Checker \
      import CheckerPublic, NamesChecker, Checker
 
+from Zope.Configuration.INonEmptyDirective import INonEmptyDirective
 from Zope.Configuration.Action import Action
 from Zope.Configuration.Exceptions import ConfigurationError
 
@@ -32,6 +33,8 @@
      import I18nFileResourceFactory
 
 class I18nResource(object):
+
+    __class_implements__ = INonEmptyDirective
 
     type = IBrowserPresentation
     default_allowed_attributes = '__call__'


=== Zope3/lib/python/Zope/App/Publisher/Browser/ResourceMeta.py 1.3 => 1.3.4.1 ===
--- Zope3/lib/python/Zope/App/Publisher/Browser/ResourceMeta.py:1.3	Tue Jun 25 10:28:42 2002
+++ Zope3/lib/python/Zope/App/Publisher/Browser/ResourceMeta.py	Mon Oct 21 19:18:28 2002
@@ -20,6 +20,7 @@
 from Zope.Security.Checker \
      import CheckerPublic, NamesChecker, Checker
 
+from Zope.Configuration.INonEmptyDirective import INonEmptyDirective
 from Zope.Configuration.Action import Action
 from Zope.Configuration.Exceptions import ConfigurationError
 
@@ -31,6 +32,8 @@
      import FileResourceFactory, ImageResourceFactory
 
 class resource(object):
+
+    __class_implements__ = INonEmptyDirective
 
     type = IBrowserPresentation
     default_allowed_attributes = '__call__'


=== Zope3/lib/python/Zope/App/Publisher/Browser/ViewMeta.py 1.4 => 1.4.4.1 ===
--- Zope3/lib/python/Zope/App/Publisher/Browser/ViewMeta.py:1.4	Thu Jun 20 16:00:27 2002
+++ Zope3/lib/python/Zope/App/Publisher/Browser/ViewMeta.py	Mon Oct 21 19:18:28 2002
@@ -22,6 +22,7 @@
 from Zope.Security.Checker \
      import CheckerPublic, NamesChecker, Checker
 
+from Zope.Configuration.INonEmptyDirective import INonEmptyDirective
 from Zope.Configuration.Action import Action
 from Zope.Configuration.Exceptions import ConfigurationError
 
@@ -38,6 +39,8 @@
 from ResourceMeta import resource
 
 class view(resource):
+
+    __class_implements__ = INonEmptyDirective
 
     __pages = None
     __default = None