[Zope3-checkins] CVS: Zope3/src/zope/app/publisher/browser - globalbrowsermenuservice.py:1.9 i18nresourcemeta.py:1.4 icon.py:1.4 metaconfigure.py:1.3 resourcemeta.py:1.5 resources.py:1.4 viewmeta.py:1.11
R. Sean Bowman
sean.bowman@acm.org
Thu, 6 Feb 2003 01:50:14 -0500
Update of /cvs-repository/Zope3/src/zope/app/publisher/browser
In directory cvs.zope.org:/tmp/cvs-serv18167/zope/app/publisher/browser
Modified Files:
globalbrowsermenuservice.py i18nresourcemeta.py icon.py
metaconfigure.py resourcemeta.py resources.py viewmeta.py
Log Message:
finished changing service names to use strings defined in
zope/component/servicenames.py, changed the name of
ErrorReportingService to ErrorReports and Resources to ResourceService
=== Zope3/src/zope/app/publisher/browser/globalbrowsermenuservice.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/publisher/browser/globalbrowsermenuservice.py:1.8 Tue Dec 31 06:29:48 2002
+++ Zope3/src/zope/app/publisher/browser/globalbrowsermenuservice.py Thu Feb 6 01:49:39 2003
@@ -21,6 +21,8 @@
from zope.configuration.interfaces import INonEmptyDirective
from zope.configuration.interfaces import ISubdirectiveHandler
+from zope.component.servicenames import Interfaces
+
from zope.security.checker import CheckerPublic
from zope.security.management import getSecurityManager
@@ -187,7 +189,7 @@
Action(
discriminator = None,
callable = handler,
- args = ('Interfaces', 'provideInterface',
+ args = (Interfaces, 'provideInterface',
self.interface.__module__+'.'+self.interface.__name__,
self.interface)
)
=== Zope3/src/zope/app/publisher/browser/i18nresourcemeta.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/publisher/browser/i18nresourcemeta.py:1.3 Mon Dec 30 21:52:01 2002
+++ Zope3/src/zope/app/publisher/browser/i18nresourcemeta.py Thu Feb 6 01:49:39 2003
@@ -25,6 +25,8 @@
from zope.configuration.action import Action
from zope.configuration.exceptions import ConfigurationError
+from zope.component.servicenames import ResourceService
+
from zope.publisher.interfaces.browser import IBrowserPresentation
from zope.app.component.metaconfigure import handler
@@ -113,7 +115,7 @@
discriminator = ('i18n-resource', self.name, self.type,
self.layer),
callable = handler,
- args = ('Resources', 'provideResource', self.name, self.type,
+ args = (ResourceService, 'provideResource', self.name, self.type,
factory, self.layer)
)
]
=== Zope3/src/zope/app/publisher/browser/icon.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/publisher/browser/icon.py:1.3 Sat Dec 28 12:49:30 2002
+++ Zope3/src/zope/app/publisher/browser/icon.py Thu Feb 6 01:49:39 2003
@@ -26,6 +26,7 @@
from zope.app.traversing.namespace import getResourceInContext
from zope.publisher.interfaces.browser import IBrowserPresentation
from zope.configuration.exceptions import ConfigurationError
+from zope.component.servicenames import Interfaces
__metaclass__ = type
@@ -103,7 +104,7 @@
Action(
discriminator = None,
callable = handler,
- args = ('Interfaces', 'provideInterface',
+ args = (Interfaces, 'provideInterface',
for_.__module__+'.'+for_.__name__,
for_)
)
=== Zope3/src/zope/app/publisher/browser/metaconfigure.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/publisher/browser/metaconfigure.py:1.2 Wed Dec 25 09:13:09 2002
+++ Zope3/src/zope/app/publisher/browser/metaconfigure.py Thu Feb 6 01:49:39 2003
@@ -19,6 +19,7 @@
from zope.configuration.action import Action
from zope.publisher.interfaces.browser import IBrowserPresentation
+from zope.component.servicenames import Interfaces
from zope.app.component.metaconfigure \
import defaultView as _defaultView, skin as _skin, handler
@@ -58,7 +59,7 @@
Action(
discriminator = None,
callable = handler,
- args = ('Interfaces', 'provideInterface',
+ args = (Interfaces, 'provideInterface',
for_.__module__+'.'+for_.__name__,
for_)
)
=== Zope3/src/zope/app/publisher/browser/resourcemeta.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/publisher/browser/resourcemeta.py:1.4 Sat Dec 28 11:14:00 2002
+++ Zope3/src/zope/app/publisher/browser/resourcemeta.py Thu Feb 6 01:49:39 2003
@@ -21,6 +21,8 @@
from zope.configuration.action import Action
from zope.configuration.exceptions import ConfigurationError
+from zope.component.servicenames import ResourceService
+
from zope.publisher.interfaces.browser import IBrowserPresentation
from zope.app.component.metaconfigure import handler
@@ -54,7 +56,7 @@
Action(
discriminator = ('resource', name, IBrowserPresentation, layer),
callable = handler,
- args = ('Resources', 'provideResource',
+ args = (ResourceService, 'provideResource',
name, IBrowserPresentation, factory, layer),
)
]
=== Zope3/src/zope/app/publisher/browser/resources.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/publisher/browser/resources.py:1.3 Sat Jan 25 08:19:25 2003
+++ Zope3/src/zope/app/publisher/browser/resources.py Thu Feb 6 01:49:39 2003
@@ -20,6 +20,7 @@
from zope.publisher.browser import BrowserView
from zope.publisher.interfaces.browser import IBrowserPublisher
from zope.component import getService
+from zope.component.servicenames import ResourceService
from zope.proxy.context import ContextWrapper
from zope.proxy.context import ContextMethod
from zope.exceptions import NotFoundError
@@ -33,7 +34,7 @@
def publishTraverse(wrapped_self, request, name):
'''See interface IBrowserPublisher'''
- resource_service = getService(wrapped_self, 'Resources')
+ resource_service = getService(wrapped_self, ResourceService)
resource = resource_service.queryResource(wrapped_self, name, request)
if resource is None:
raise NotFoundError(wrapped_self, name)
=== Zope3/src/zope/app/publisher/browser/viewmeta.py 1.10 => 1.11 ===
--- Zope3/src/zope/app/publisher/browser/viewmeta.py:1.10 Mon Feb 3 11:34:37 2003
+++ Zope3/src/zope/app/publisher/browser/viewmeta.py Thu Feb 6 01:49:39 2003
@@ -29,6 +29,8 @@
from zope.configuration.action import Action
from zope.configuration.exceptions import ConfigurationError
+from zope.component.servicenames import Interfaces
+
from zope.publisher.interfaces.browser import IBrowserPresentation
from zope.publisher.interfaces.browser import IBrowserPublisher
@@ -390,7 +392,7 @@
Action(
discriminator = None,
callable = handler,
- args = ('Interfaces', 'provideInterface',
+ args = (Interfaces, 'provideInterface',
for_.__module__+'.'+for_.__name__,
for_)
)
@@ -429,7 +431,7 @@
i = _context.resolve(i)
actions .append(
Action(discriminator = None, callable = handler,
- args = ('Interfaces', 'provideInterface', None, i)
+ args = (Interfaces, 'provideInterface', None, i)
))
for name in i:
required[name] = permission
@@ -450,7 +452,7 @@
actions .append(
Action(discriminator = None, callable = handler,
- args = ('Interfaces', 'provideInterface', None, for_)
+ args = (Interfaces, 'provideInterface', None, for_)
))
return for_