[Zope3-checkins] CVS: Zope3/src/zope/app/publisher/browser - configure.zcml:1.1.2.2 fileresource.py:1.1.2.3 i18nfileresource.py:1.1.2.2 i18nresourcemeta.py:1.1.2.2 meta.zcml:1.1.2.2 metaconfigure.py:1.1.2.2 resourcemeta.py:1.1.2.2 resources.py:1.1.2.3 viewmeta.py:1.1.2.3
Jim Fulton
jim@zope.com
Tue, 24 Dec 2002 07:51:42 -0500
Update of /cvs-repository/Zope3/src/zope/app/publisher/browser
In directory cvs.zope.org:/tmp/cvs-serv1158/src/zope/app/publisher/browser
Modified Files:
Tag: NameGeddon-branch
configure.zcml fileresource.py i18nfileresource.py
i18nresourcemeta.py meta.zcml metaconfigure.py resourcemeta.py
resources.py viewmeta.py
Log Message:
Searched for and changed over 1200 references to Zope.something.
Most of these were either comments, doc strings, or permission ids.
Many were imports or ids in zcml. (much zcml fixup is still needed.
=== Zope3/src/zope/app/publisher/browser/configure.zcml 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/publisher/browser/configure.zcml:1.1.2.1 Mon Dec 23 14:32:02 2002
+++ Zope3/src/zope/app/publisher/browser/configure.zcml Tue Dec 24 07:51:12 2002
@@ -7,7 +7,7 @@
<serviceType id="BrowserMenu"
interface="zope.app.interfaces.publisher.browser.IBrowserMenuService" />
<service serviceType="BrowserMenu"
- permission="Zope.Public"
+ permission="zope.Public"
component="zope.app.publisher.browser.globalbrowsermenuservice.globalBrowserMenuService" />
@@ -32,7 +32,7 @@
<browser:view name=""
factory="zope.app.publisher.browser.resources.Resources"
for="zope.app.interfaces.services.service.IServiceManagerContainer"
- permission="Zope.Public"
+ permission="zope.Public"
allowed_interface="zope.publisher.interfaces.browser.IBrowserPublisher"
/>
=== Zope3/src/zope/app/publisher/browser/fileresource.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/publisher/browser/fileresource.py:1.1.2.2 Mon Dec 23 16:05:59 2002
+++ Zope3/src/zope/app/publisher/browser/fileresource.py Tue Dec 24 07:51:12 2002
@@ -33,10 +33,6 @@
__implements__ = IBrowserResource, IBrowserPublisher
- ############################################################
- # Implementation methods for interface
- # Zope.Publisher.Browser.IBrowserPublisher.
-
def publishTraverse(self, request, name):
'''See interface IBrowserPublisher'''
raise NotFoundError(name)
=== Zope3/src/zope/app/publisher/browser/i18nfileresource.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/publisher/browser/i18nfileresource.py:1.1.2.1 Mon Dec 23 14:32:02 2002
+++ Zope3/src/zope/app/publisher/browser/i18nfileresource.py Tue Dec 24 07:51:12 2002
@@ -66,18 +66,18 @@
# II18nAware.py
def getDefaultLanguage(self):
- 'See Zope.I18n.II18nAware.II18nAware'
+ 'See II18nAware'
return self.defaultLanguage
def setDefaultLanguage(self, language):
- 'See Zope.I18n.II18nAware.II18nAware'
+ 'See II18nAware'
if not self._data.has_key(language):
raise ValueError, \
'cannot set nonexistent language (%s) as default' % language
self.defaultLanguage = language
def getAvailableLanguages(self):
- 'See Zope.I18n.II18nAware.II18nAware'
+ 'See II18nAware'
return self._data.keys()
#
=== Zope3/src/zope/app/publisher/browser/i18nresourcemeta.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/publisher/browser/i18nresourcemeta.py:1.1.2.1 Mon Dec 23 14:32:02 2002
+++ Zope3/src/zope/app/publisher/browser/i18nresourcemeta.py Tue Dec 24 07:51:12 2002
@@ -100,7 +100,7 @@
if require is None:
require = {}
- if permission == 'Zope.Public':
+ if permission == 'zope.Public':
permission = CheckerPublic
if require:
=== Zope3/src/zope/app/publisher/browser/meta.zcml 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/publisher/browser/meta.zcml:1.1.2.1 Mon Dec 23 14:32:02 2002
+++ Zope3/src/zope/app/publisher/browser/meta.zcml Tue Dec 24 07:51:12 2002
@@ -231,7 +231,7 @@
<directive
name="menu"
handler="
- Zope.App.Publisher.Browser.GlobalBrowserMenuService.menuDirective">
+ zope.app.publisher.browser.globalbrowsermenuservice.menuDirective">
<attribute
name="name" />
<attribute
@@ -244,7 +244,7 @@
name="menuItems"
attributes="menu for"
handler="
- Zope.App.Publisher.Browser.GlobalBrowserMenuService.menuItemsDirective"
+ zope.app.publisher.browser.globalbrowsermenuservice.menuItemsDirective"
>
<subdirective
name="menuItem"
@@ -263,7 +263,7 @@
<directive
name="menuItem"
handler="
- Zope.App.Publisher.Browser.GlobalBrowserMenuService.menuItemDirective"
+ zope.app.publisher.browser.globalbrowsermenuservice.menuItemDirective"
>
<attribute
name="menu" />
=== Zope3/src/zope/app/publisher/browser/metaconfigure.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/publisher/browser/metaconfigure.py:1.1.2.1 Mon Dec 23 14:32:02 2002
+++ Zope3/src/zope/app/publisher/browser/metaconfigure.py Tue Dec 24 07:51:12 2002
@@ -30,7 +30,7 @@
def skin(_context, **__kw):
return _skin(_context,
- type='Zope.Publisher.Browser.IBrowserPresentation.',
+ type='zope.publisher.interfaces.browser.IBrowserPresentation',
**__kw)
def defaultView(_context, name, for_=None, **__kw):
=== Zope3/src/zope/app/publisher/browser/resourcemeta.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/publisher/browser/resourcemeta.py:1.1.2.1 Mon Dec 23 14:32:02 2002
+++ Zope3/src/zope/app/publisher/browser/resourcemeta.py Tue Dec 24 07:51:12 2002
@@ -121,7 +121,7 @@
def _pageFactory(self, factory, attribute, permission):
if permission:
- if permission == 'Zope.Public':
+ if permission == 'zope.Public':
permission = CheckerPublic
def pageView(request,
@@ -151,7 +151,7 @@
if require is None:
require = {}
- if permission == 'Zope.Public':
+ if permission == 'zope.Public':
permission = CheckerPublic
if ((not allowed_attributes) and (allowed_interface is None)
=== Zope3/src/zope/app/publisher/browser/resources.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/publisher/browser/resources.py:1.1.2.2 Mon Dec 23 18:52:34 2002
+++ Zope3/src/zope/app/publisher/browser/resources.py Tue Dec 24 07:51:12 2002
@@ -30,10 +30,6 @@
__implements__ = BrowserView.__implements__, IBrowserPublisher
- ############################################################
- # Implementation methods for interface
- # Zope.Publisher.Browser.IBrowserPublisher.
-
def publishTraverse(wrapped_self, request, name):
'''See interface IBrowserPublisher'''
=== Zope3/src/zope/app/publisher/browser/viewmeta.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/publisher/browser/viewmeta.py:1.1.2.2 Tue Dec 24 01:54:27 2002
+++ Zope3/src/zope/app/publisher/browser/viewmeta.py Tue Dec 24 07:51:12 2002
@@ -169,7 +169,7 @@
def _pageFactory(self, factory, attribute, permission):
factory = factory[:]
if permission:
- if permission == 'Zope.Public':
+ if permission == 'zope.Public':
permission = CheckerPublic
def pageView(context, request,
@@ -226,7 +226,7 @@
# We need to set the default permission on pages if the pages
# don't already have a permission explicitly set
permission = permission or self.permission
- if permission == 'Zope.Public':
+ if permission == 'zope.Public':
permission = CheckerPublic
if not attribute:
@@ -246,7 +246,7 @@
self.factory = factory
permission_for_browser_publisher = self.permission
- if permission_for_browser_publisher == 'Zope.Public':
+ if permission_for_browser_publisher == 'zope.Public':
permission_for_browser_publisher = CheckerPublic
for name in IBrowserPublisher.names(all=1):
require[name] = permission_for_browser_publisher