[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/Publisher/Browser - configure.zcml:1.5.6.1 metaConfigure.py:1.5.6.6
Jim Fulton
jim@zope.com
Wed, 13 Nov 2002 15:23:56 -0500
Update of /cvs-repository/Zope3/lib/python/Zope/App/Publisher/Browser
In directory cvs.zope.org:/tmp/cvs-serv568/lib/python/Zope/App/Publisher/Browser
Modified Files:
Tag: Zope3-Bangalore-TTW-Branch
configure.zcml metaConfigure.py
Log Message:
fixed DOS line endings
=== Zope3/lib/python/Zope/App/Publisher/Browser/configure.zcml 1.5 => 1.5.6.1 ===
--- Zope3/lib/python/Zope/App/Publisher/Browser/configure.zcml:1.5 Thu Aug 1 14:42:13 2002
+++ Zope3/lib/python/Zope/App/Publisher/Browser/configure.zcml Wed Nov 13 15:23:26 2002
@@ -1,39 +1,39 @@
-<zopeConfigure
- xmlns='http://namespaces.zope.org/zope'
- xmlns:browser='http://namespaces.zope.org/browser'
->
-
-
-<serviceType id="BrowserMenu"
- interface=".IBrowserMenuService." />
-<service serviceType="BrowserMenu"
- permission="Zope.Public"
- component=".GlobalBrowserMenuService.globalBrowserMenuService" />
-
-
-<content class="Zope.Publisher.Browser.BrowserRequest.">
- <allow
- interface="Zope.Publisher.Browser.IBrowserApplicationRequest." />
- <allow
- interface="Zope.ComponentArchitecture.IPresentationRequest." />
-</content>
-
-<content class=".FileResource.">
- <allow interface="Zope.Publisher.Browser.IBrowserPublisher." />
- <allow attributes="GET HEAD __call__" />
-</content>
-
-<content class=".I18nFileResource.">
- <allow interface="Zope.Publisher.Browser.IBrowserPublisher." />
- <allow attributes="GET HEAD __call__" />
-</content>
-
-
-<browser:view name=""
- factory=".Resources."
- for="Zope.App.ComponentArchitecture.IServiceManagerContainer."
- permission="Zope.Public"
- allowed_interface="Zope.Publisher.Browser.IBrowserPublisher."
- />
-
-</zopeConfigure>
+<zopeConfigure
+ xmlns='http://namespaces.zope.org/zope'
+ xmlns:browser='http://namespaces.zope.org/browser'
+>
+
+
+<serviceType id="BrowserMenu"
+ interface=".IBrowserMenuService." />
+<service serviceType="BrowserMenu"
+ permission="Zope.Public"
+ component=".GlobalBrowserMenuService.globalBrowserMenuService" />
+
+
+<content class="Zope.Publisher.Browser.BrowserRequest.">
+ <allow
+ interface="Zope.Publisher.Browser.IBrowserApplicationRequest." />
+ <allow
+ interface="Zope.ComponentArchitecture.IPresentationRequest." />
+</content>
+
+<content class=".FileResource.">
+ <allow interface="Zope.Publisher.Browser.IBrowserPublisher." />
+ <allow attributes="GET HEAD __call__" />
+</content>
+
+<content class=".I18nFileResource.">
+ <allow interface="Zope.Publisher.Browser.IBrowserPublisher." />
+ <allow attributes="GET HEAD __call__" />
+</content>
+
+
+<browser:view name=""
+ factory=".Resources."
+ for="Zope.App.ComponentArchitecture.IServiceManagerContainer."
+ permission="Zope.Public"
+ allowed_interface="Zope.Publisher.Browser.IBrowserPublisher."
+ />
+
+</zopeConfigure>
=== Zope3/lib/python/Zope/App/Publisher/Browser/metaConfigure.py 1.5.6.5 => 1.5.6.6 ===
--- Zope3/lib/python/Zope/App/Publisher/Browser/metaConfigure.py:1.5.6.5 Thu Oct 24 06:07:21 2002
+++ Zope3/lib/python/Zope/App/Publisher/Browser/metaConfigure.py Wed Nov 13 15:23:26 2002
@@ -1,68 +1,68 @@
-##############################################################################
-#
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Browser configuration code
-
-$Id$
-"""
-
-from Zope.Configuration.Action import Action
-
-from Zope.Publisher.Browser.IBrowserPresentation import IBrowserPresentation
-
-from Zope.App.ComponentArchitecture.metaConfigure \
- import defaultView as _defaultView, skin as _skin, handler
-
-from ResourceMeta import resource
-from I18nResourceMeta import I18nResource
-from ViewMeta import view
-from Interface import Interface
-
-def skin(_context, **__kw):
- return _skin(_context,
- type='Zope.Publisher.Browser.IBrowserPresentation.',
- **__kw)
-
-def defaultView(_context, name, for_=None, **__kw):
-
- if __kw:
- actions = view(_context, name=name, for_=for_, **__kw)()
- else:
- actions = []
-
- if for_ is not None:
- for_ = _context.resolve(for_)
-
- type = IBrowserPresentation
-
- actions += [
- Action(
- discriminator = ('defaultViewName', for_, type, name),
- callable = handler,
- args = ('Views','setDefaultViewName', for_, type, name),
- )
- ]
- if for_ is not None:
- actions.append
- (
- Action(
- discriminator = None,
- callable = handler,
- args = ('Interfaces', 'provideInterface',
- for_.__module__+'.'+for_.__name__,
- for_)
- )
- )
-
-
- return actions
+##############################################################################
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Browser configuration code
+
+$Id$
+"""
+
+from Zope.Configuration.Action import Action
+
+from Zope.Publisher.Browser.IBrowserPresentation import IBrowserPresentation
+
+from Zope.App.ComponentArchitecture.metaConfigure \
+ import defaultView as _defaultView, skin as _skin, handler
+
+from ResourceMeta import resource
+from I18nResourceMeta import I18nResource
+from ViewMeta import view
+from Interface import Interface
+
+def skin(_context, **__kw):
+ return _skin(_context,
+ type='Zope.Publisher.Browser.IBrowserPresentation.',
+ **__kw)
+
+def defaultView(_context, name, for_=None, **__kw):
+
+ if __kw:
+ actions = view(_context, name=name, for_=for_, **__kw)()
+ else:
+ actions = []
+
+ if for_ is not None:
+ for_ = _context.resolve(for_)
+
+ type = IBrowserPresentation
+
+ actions += [
+ Action(
+ discriminator = ('defaultViewName', for_, type, name),
+ callable = handler,
+ args = ('Views','setDefaultViewName', for_, type, name),
+ )
+ ]
+ if for_ is not None:
+ actions.append
+ (
+ Action(
+ discriminator = None,
+ callable = handler,
+ args = ('Interfaces', 'provideInterface',
+ for_.__module__+'.'+for_.__name__,
+ for_)
+ )
+ )
+
+
+ return actions