[Zope3-checkins] CVS: Zope3/src/zope/app/services - menu.py:1.10 menu.zcml:1.4

[Philipp von Weitershausen]

Update of /cvs-repository/Zope3/src/zope/app/services
In directory cvs.zope.org:/tmp/cvs-serv26362/services

Modified Files:
	menu.py menu.zcml 
Log Message:
Moved publisher interfaces from zope.app.interfaces.publisher to
zope.app.publisher.interfaces.


=== Zope3/src/zope/app/services/menu.py 1.9 => 1.10 ===
--- Zope3/src/zope/app/services/menu.py:1.9	Fri Feb 20 11:57:30 2004
+++ Zope3/src/zope/app/services/menu.py	Tue Mar  2 12:40:52 2004
@@ -23,7 +23,7 @@
 from zope.app.container.ordered import OrderedContainer
 from zope.app.interfaces.services.menu import \
      ILocalBrowserMenu, ILocalBrowserMenuService
-from zope.app.interfaces.publisher.browser import \
+from zope.app.publisher.interfaces.browser import \
      IBrowserMenuItem, IGlobalBrowserMenuService
 from zope.app.interfaces.services.service import ISimpleService
 from zope.app.publisher.browser.globalbrowsermenuservice import \
@@ -40,22 +40,22 @@
 
     implements(IBrowserMenuItem)
 
-    # See zope.app.interfaces.publisher.browser.IBrowserMenuItem
+    # See zope.app.publisher.interfaces.browser.IBrowserMenuItem
     interface = None
 
-    # See zope.app.interfaces.publisher.browser.IBrowserMenuItem
+    # See zope.app.publisher.interfaces.browser.IBrowserMenuItem
     action = u''
 
-    # See zope.app.interfaces.publisher.browser.IBrowserMenuItem
+    # See zope.app.publisher.interfaces.browser.IBrowserMenuItem
     title = u''
 
-    # See zope.app.interfaces.publisher.browser.IBrowserMenuItem
+    # See zope.app.publisher.interfaces.browser.IBrowserMenuItem
     description = u''
 
-    # See zope.app.interfaces.publisher.browser.IBrowserMenuItem
+    # See zope.app.publisher.interfaces.browser.IBrowserMenuItem
     permission = None
 
-    # See zope.app.interfaces.publisher.browser.IBrowserMenuItem
+    # See zope.app.publisher.interfaces.browser.IBrowserMenuItem
     filter_string = u''
 
     # XXX the filter should probably be some kind of descriptor.
@@ -69,16 +69,16 @@
 
     implements(ILocalBrowserMenu)
 
-    # See zope.app.interfaces.publisher.browser.IBrowserMenu
+    # See zope.app.publisher.interfaces.browser.IBrowserMenu
     title = u''
 
-    # See zope.app.interfaces.publisher.browser.IBrowserMenu
+    # See zope.app.publisher.interfaces.browser.IBrowserMenu
     description = u''
 
-    # See zope.app.interfaces.publisher.browser.IBrowserMenu
+    # See zope.app.publisher.interfaces.browser.IBrowserMenu
     usage = u''
 
-    # See zope.app.interfaces.publisher.browser.IBrowserMenu
+    # See zope.app.publisher.interfaces.browser.IBrowserMenu
     inherit = True
 
     def __init__(self):
@@ -86,7 +86,7 @@
         self._next = 0
 
     def getMenuItems(self, object=None):
-        """See zope.app.interfaces.publisher.browser.IBrowserMenu"""
+        """See zope.app.publisher.interfaces.browser.IBrowserMenu"""
         result = []
         interfaces = list(providedBy(object).flattened())
         for menuitem in self.values():
@@ -116,7 +116,7 @@
 
 
     def getAllLocalMenus(self):
-        """See zope.app.interfaces.publisher.browser.IBrowserMenuService"""
+        """See zope.app.publisher.interfaces.browser.IBrowserMenuService"""
         utilities = zapi.getService(self, Utilities)
         menus = utilities.getLocalUtilitiesFor(ILocalBrowserMenu)
         return map(lambda m: m[1], menus)
@@ -163,7 +163,7 @@
 
 
     def getAllMenuItems(self, menu_id, object):
-        """See zope.app.interfaces.publisher.browser.IBrowserMenuService"""
+        """See zope.app.publisher.interfaces.browser.IBrowserMenuService"""
         result = []
 
         # Find the local items, if available
@@ -183,18 +183,18 @@
 
 
     def getMenu(self, menu_id, object, request, max=999999):
-        """See zope.app.interfaces.publisher.browser.IBrowserMenuService"""
+        """See zope.app.publisher.interfaces.browser.IBrowserMenuService"""
         return super(LocalBrowserMenuService,
                      self).getMenu(menu_id, object, request, max)
 
 
     def getFirstMenuItem(self, menu_id, object, request):
-        """See zope.app.interfaces.publisher.browser.IBrowserMenuService"""
+        """See zope.app.publisher.interfaces.browser.IBrowserMenuService"""
         return super(LocalBrowserMenuService,
                      self).getFirstMenuItem(menu_id, object, request)
 
 
     def getMenuUsage(self, menu_id):
-        """See zope.app.interfaces.publisher.browser.IBrowserMenuService"""
+        """See zope.app.publisher.interfaces.browser.IBrowserMenuService"""
         return self.getInheritedMenu(menu_id, True).usage
 


=== Zope3/src/zope/app/services/menu.zcml 1.3 => 1.4 ===
--- Zope3/src/zope/app/services/menu.zcml:1.3	Tue Sep 16 18:02:14 2003
+++ Zope3/src/zope/app/services/menu.zcml	Tue Mar  2 12:40:52 2004
@@ -58,8 +58,9 @@
 
     <require
         permission="zope.ManageServices"
-        interface="zope.app.interfaces.publisher.browser.IBrowserMenuItem"
-        set_schema="zope.app.interfaces.publisher.browser.IBrowserMenuItem" />
+        interface="zope.app.publisher.interfaces.browser.IBrowserMenuItem"
+        set_schema="zope.app.publisher.interfaces.browser.IBrowserMenuItem"
+        />
 
   </content>