[Zope3-checkins] CVS: Zope3/src/zope/app/interfaces/publisher - browser.py:1.3

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/interfaces/publisher
In directory cvs.zope.org:/tmp/cvs-serv23410

Modified Files:
	browser.py 
Log Message:
Moved icon implementation where it belongs.


=== Zope3/src/zope/app/interfaces/publisher/browser.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/interfaces/publisher/browser.py:1.2	Wed Dec 25 09:13:00 2002
+++ Zope3/src/zope/app/interfaces/publisher/browser.py	Sat Dec 28 11:25:45 2002
@@ -54,97 +54,3 @@
 
 
 
-"""
-
-$Id$
-"""
-import os
-import re
-
-from zope.app.component.metaconfigure import handler
-from zope.configuration.action import Action
-from zope.component import getResource
-from zope.app.publisher.browser import metaconfigure
-from zope.app.traversing.getresource import getResource
-from zope.publisher.interfaces.browser import IBrowserPresentation
-from zope.configuration.exceptions import ConfigurationError
-
-IName = re.compile('I[A-Z][a-z]')
-
-class IconView:
-
-    def __init__(self, context, request, rname, alt):
-        self.context = context
-        self.request = request
-        self.rname = rname
-        self.alt = alt
-
-    def __call__(self):
-        resource = getResource(self.context, self.rname, self.request)
-        src = resource()
-
-        return ('<img src="%s" alt="%s" width="16" height="16" border="0" />'
-                % (src, self.alt))
-
-    def url(self):
-        resource = getResource(self.context, self.rname, self.request)
-        src = resource()
-        return src
-
-class IconViewFactory:
-
-    def __init__(self, rname, alt):
-        self.rname = rname
-        self.alt = alt
-
-    def __call__(self, context, request):
-        return IconView(context, request, self.rname, self.alt)
-
-def IconDirective(_context, name, for_, file=None, resource=None,
-                  layer='default', alt=None):
-
-    for_ = _context.resolve(for_)
-    iname = for_.__name__
-
-    if alt is None:
-        alt = iname
-        if IName.match(alt):
-            alt = alt[1:] # Remove leading 'I'
-
-    results = []
-    if file is not None and resource is not None:
-        raise ConfigurationError(
-            "Can't use more than one of file, and resource "
-            "attributes for icon directives"
-            )
-    elif file is not None:
-        resource = '-'.join(for_.__module__.split('.'))
-        resource = "%s-%s-%s" % (resource, iname, name)
-        ext = os.path.splitext(file)[1]
-        if ext:
-            resource += ext
-        results = metaconfigure.resource(_context, image=file,
-                              name=resource, layer=layer)()
-    elif resource is None:
-        raise ConfigurationError(
-            "At least one of the file, and resource "
-            "attributes for resource directives must be specified"
-            )
-
-    vfactory = IconViewFactory(resource, alt)
-
-    return results + [
-        Action(
-        discriminator = ('view', name, vfactory, layer),
-        callable = handler,
-        args = ('Views', 'provideView',
-                for_, name, IBrowserPresentation,
-                vfactory, layer)),
-        Action(
-        discriminator = None,
-        callable = handler,
-        args = ('Interfaces', 'provideInterface',
-                for_.__module__+'.'+for_.__name__,
-                for_)
-        )
-        ]