[Zope3-checkins] CVS: Zope3/src/zope/app/content - configure.zcml:1.1.2.2 dtmlpage.py:1.1.2.4 file.py:1.1.2.3 i18nimage.py:1.1.2.2 image.py:1.1.2.2 sql.py:1.1.2.3 zpt.py:1.1.2.4
Jim Fulton
jim@zope.com
Tue, 24 Dec 2002 07:52:01 -0500
Update of /cvs-repository/Zope3/src/zope/app/content
In directory cvs.zope.org:/tmp/cvs-serv1158/src/zope/app/content
Modified Files:
Tag: NameGeddon-branch
configure.zcml dtmlpage.py file.py i18nimage.py image.py
sql.py zpt.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/content/configure.zcml 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/content/configure.zcml:1.1.2.1 Mon Dec 23 14:31:29 2002
+++ Zope3/src/zope/app/content/configure.zcml Tue Dec 24 07:51:00 2002
@@ -10,7 +10,7 @@
<factory
id="Folder"
- permission="Zope.ManageContent"
+ permission="zope.ManageContent"
title="Folder"
description="Minimal folder" />
@@ -19,17 +19,17 @@
/>
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.services.service.Write"
/>
<require
- permission="Zope.View"
+ permission="zope.View"
interface="zope.app.interfaces.container.IReadContainer"
/>
<require
- permission="Zope.ManageContent"
+ permission="zope.ManageContent"
interface="zope.app.interfaces.container.IWriteContainer"
/>
@@ -55,24 +55,24 @@
xmlns='http://namespaces.zope.org/zope'
xmlns:browser='http://namespaces.zope.org/browser'
>
- <permission id="Zope.AddImages" title="Add Images" />
+ <permission id="zope.AddImages" title="Add Images" />
<content class="zope.app.content.image.Image">
<factory
id="Image"
- permission="Zope.ManageContent"
+ permission="zope.ManageContent"
title="Image"
description="An Image" />
<require
- permission="Zope.View"
+ permission="zope.View"
interface="zope.app.interfaces.content.file.IReadFile"
attributes="getImageSize"
/>
<require
- permission="Zope.ManageContent"
+ permission="zope.ManageContent"
interface="zope.app.interfaces.content.file.IWriteFile"
set_schema="zope.app.interfaces.content.file.IReadFile"
/>
@@ -84,22 +84,22 @@
<content class="zope.app.content.i18nimage.I18nImage">
<factory
id="I18nImage"
- permission="Zope.ManageContent"
+ permission="zope.ManageContent"
title="I18n Image"
description="An Internationalized Image" />
<require
- permission="Zope.View"
+ permission="zope.View"
interface="zope.app.interfaces.content.file.IReadFile"
attributes="getImageSize"
/>
<require
- permission="Zope.ManageContent"
+ permission="zope.ManageContent"
interface="zope.app.interfaces.content.file.IWriteFile" />
<require
- permission="Zope.View"
+ permission="zope.View"
attributes="getDefaultLanguage getAvailableLanguages" />
<require
- permission="Zope.ManageContent"
+ permission="zope.ManageContent"
attributes="setDefaultLanguage removeLanguage" />
<implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
@@ -117,31 +117,31 @@
<content class="zope.app.content.zpt.ZPTPage">
<factory
id="ZPTPage"
- permission="Zope.ManageContent"
+ permission="zope.ManageContent"
title="ZPT Page"
description="A simple, content-based Page Template" />
<factory
id=".pt"
- permission="Zope.ManageContent"
+ permission="zope.ManageContent"
title="ZPT Page" />
<factory
id=".zpt"
- permission="Zope.ManageContent"
+ permission="zope.ManageContent"
title="ZPT Page" />
<require
- permission="Zope.View"
+ permission="zope.View"
attributes="__call__" />
<require
- permission="Zope.ManageContent"
+ permission="zope.ManageContent"
interface="zope.app.content.zpt.IZPTPage"
set_attributes="source" />
<require
- permission="Zope.View"
+ permission="zope.View"
interface="zope.app.content.zpt.IRenderZPTPage" />
<implements
@@ -165,17 +165,17 @@
<factory
id="DTMLPage"
- permission="Zope.ManageContent"
+ permission="zope.ManageContent"
title="DTML Page"
description="A simple, content-based Page Template" />
- <require permission="Zope.View"
+ <require permission="zope.View"
attributes="__call__" />
- <require permission="Zope.ManageContent"
+ <require permission="zope.ManageContent"
interface="zope.app.content.dtmlpage.IDTMLPage" />
- <require permission="Zope.View"
+ <require permission="zope.View"
interface="zope.app.content.dtmlpage.IRenderDTMLPage" />
@@ -206,16 +206,16 @@
<factory
id="File"
- permission="Zope.ManageContent"
+ permission="zope.ManageContent"
title="File"
description="A File" />
<require
- permission="Zope.View"
+ permission="zope.View"
interface="zope.app.interfaces.content.file.IReadFile" />
<require
- permission="Zope.ManageContent"
+ permission="zope.ManageContent"
interface="zope.app.interfaces.content.file.IWriteFile"
set_schema="zope.app.interfaces.content.file.IReadFile"
/>
@@ -227,20 +227,20 @@
<content class="zope.app.interfaces.content.18nfile.I18nFile">
<factory
id="I18nFile"
- permission="Zope.ManageContent"
+ permission="zope.ManageContent"
title="I18n File"
description="An Internationalized File" />
<require
- permission="Zope.View"
+ permission="zope.View"
interface="zope.app.interfaces.content.file.IReadFile" />
<require
- permission="Zope.ManageContent"
+ permission="zope.ManageContent"
interface="zope.app.interfaces.content.file.IWriteFile" />
<require
- permission="Zope.View"
+ permission="zope.View"
attributes="getDefaultLanguage getAvailableLanguages" />
<require
- permission="Zope.ManageContent"
+ permission="zope.ManageContent"
attributes="setDefaultLanguage removeLanguage" />
<implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
@@ -261,24 +261,24 @@
<!-- SQL Script Directives -->
- <permission id="Zope.AddSQLScripts" title="Add SQL Scripts" />
+ <permission id="zope.AddSQLScripts" title="Add SQL Scripts" />
<content class="zope.app.content.sql.SQLScript">
<factory
id="SQLScript"
- permission="Zope.ManageContent"
+ permission="zope.ManageContent"
title="SQL Script"
description="Dynamic SQL Script" />
<require
- permission = "Zope.ManageContent"
+ permission = "zope.ManageContent"
interface = ".ISQLScript."
set_schema = ".ISQLScript."
/>
<require
- permission="Zope.ManageContent"
+ permission="zope.ManageContent"
interface="zope.app.interfaces.content.file.IFileContent" />
<implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
@@ -290,7 +290,7 @@
<content class="zope.app.content.sql.Arguments">
<require
- permission="Zope.ManageContent"
+ permission="zope.ManageContent"
interface="zope.interface.common.mapping.IEnumerableMapping" />
</content>
@@ -299,7 +299,7 @@
<content class="zope.app.content.sql.SQLDTML">
<require
- permission="Zope.ManageContent"
+ permission="zope.ManageContent"
attributes="__call__" />
</content>
=== Zope3/src/zope/app/content/dtmlpage.py 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zope/app/content/dtmlpage.py:1.1.2.3 Mon Dec 23 18:52:33 2002
+++ Zope3/src/zope/app/content/dtmlpage.py Tue Dec 24 07:51:00 2002
@@ -37,7 +37,7 @@
def getSource():
"""Get the source of the page template."""
- source = Zope.Schema.Bytes(
+ source = zope.schema.Bytes(
title=u"Source",
description=u"""The source od the page template.""",
required=True)
=== Zope3/src/zope/app/content/file.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/content/file.py:1.1.2.2 Tue Dec 24 02:54:24 2002
+++ Zope3/src/zope/app/content/file.py Tue Dec 24 07:51:00 2002
@@ -45,7 +45,7 @@
def setContentType(self, contentType):
- '''See interface Zope.App.OFS.Content.File.IFile.IFile'''
+ '''See interface IFile'''
self._contentType = contentType
@@ -55,7 +55,7 @@
def edit(self, data, contentType=None):
- '''See interface Zope.App.OFS.Content.File.IFile.IFile'''
+ '''See interface IFile'''
# XXX This seems broken to me, as setData can override the
# content type explicitly passed in.
@@ -69,7 +69,7 @@
def getData(self):
- '''See interface Zope.App.OFS.Content.File.IFile.IFile'''
+ '''See interface IFile'''
if hasattr(self._data, '__class__') and \
self._data.__class__ is FileChunk:
return str(self._data)
@@ -78,7 +78,7 @@
def setData(self, data):
- '''See interface Zope.App.OFS.Content.File.IFile.IFile'''
+ '''See interface IFile'''
# Handle case when data is a string
if isinstance(data, unicode):
data = data.encode('UTF-8')
@@ -165,7 +165,7 @@
def getSize(self):
- '''See interface Zope.App.OFS.Content.File.IFile.IFile'''
+ '''See interface IFile'''
return self._size
data = property(getData, setData, None,
=== Zope3/src/zope/app/content/i18nimage.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/content/i18nimage.py:1.1.2.1 Mon Dec 23 14:31:29 2002
+++ Zope3/src/zope/app/content/i18nimage.py Tue Dec 24 07:51:00 2002
@@ -55,13 +55,6 @@
self.setContentType(contentType)
- ############################################################
- # Implementation methods for interface
- # Zope.App.OFS.Image.IImage
-
def getImageSize(self, language=None):
'''See interface IImage'''
return self._get(language).getImageSize()
-
- #
- ############################################################
=== Zope3/src/zope/app/content/image.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/content/image.py:1.1.2.1 Mon Dec 23 14:31:29 2002
+++ Zope3/src/zope/app/content/image.py Tue Dec 24 07:51:00 2002
@@ -33,7 +33,7 @@
__implements__ = IImage, IAnnotatable
def __init__(self, data=None):
- '''See interface Zope.App.OFS.Content.File.IFile.IFile'''
+ '''See interface IFile'''
self.contentType, self._width, self._height = getImageInfo(data)
self.data = data
=== Zope3/src/zope/app/content/sql.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/content/sql.py:1.1.2.2 Tue Dec 24 02:52:32 2002
+++ Zope3/src/zope/app/content/sql.py Tue Dec 24 07:51:00 2002
@@ -377,34 +377,34 @@
self.setArguments(arguments)
def setArguments(self, arguments):
- 'See Zope.App.OFS.Content.SQLScript.ISQLScript.ISQLScript'
+ 'See ISQLScript'
assert isinstance(arguments, StringTypes), \
'"arguments" argument of setArguments() must be a string'
self._arg_string = arguments
self._arguments = parseArguments(arguments)
def getArguments(self):
- 'See Zope.App.OFS.Content.SQLScript.ISQLScript.ISQLScript'
+ 'See ISQLScript'
return self._arguments
def getArgumentsString(self):
- 'See Zope.App.OFS.Content.SQLScript.ISQLScript.ISQLScript'
+ 'See ISQLScript'
return self._arg_string
def setSource(self, source):
- 'See Zope.App.OFS.Content.SQLScript.ISQLScript.ISQLScript'
+ 'See ISQLScript'
self.template.munge(source)
def getSource(self):
- 'See Zope.App.OFS.Content.SQLScript.ISQLScript.ISQLScript'
+ 'See ISQLScript'
return self.template.read_raw()
def getTemplate(self):
- 'See Zope.App.OFS.Content.SQLScript.ISQLScript.ISQLScript'
+ 'See ISQLScript'
return self.template
def setConnectionName(self, name):
- 'See Zope.App.OFS.Content.SQLScript.ISQLScript.ISQLScript'
+ 'See ISQLScript'
self._connectionName = name
cache = getCacheForObj(self)
location = getLocationForCache(self)
@@ -415,11 +415,11 @@
setConnectionName = ContextMethod(setConnectionName)
def getConnectionName(self):
- 'See Zope.App.OFS.Content.SQLScript.ISQLScript.ISQLScript'
+ 'See ISQLScript'
return self._connectionName
def getConnection(self):
- 'See Zope.App.RDB.ISQLCommand.ISQLCommand'
+ 'See ISQLCommand'
connection_service = getService(self, "SQLDatabaseConnections")
connection = connection_service.getConnection(self.connectionName)
return connection
@@ -427,7 +427,7 @@
getConnection = ContextMethod(getConnection)
def __call__(self, **kw):
- 'See Zope.App.RDB.ISQLCommand.ISQLCommand'
+ 'See ISQLCommand'
# Try to resolve arguments
arg_values = {}
@@ -477,7 +477,7 @@
__call__ = ContextMethod(__call__)
- # See Zope.App.OFS.Content.SQLScript.ISQLScript.ISQLScript
+ # See ISQLScript
arguments = property(getArgumentsString, setArguments, None,
"Set the arguments that are used for the SQL Script.")
source = property(getSource, setSource, None,
=== Zope3/src/zope/app/content/zpt.py 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zope/app/content/zpt.py:1.1.2.3 Mon Dec 23 18:52:33 2002
+++ Zope3/src/zope/app/content/zpt.py Tue Dec 24 07:51:00 2002
@@ -45,7 +45,7 @@
def getSource():
"""Get the source of the page template."""
- source = Zope.Schema.Text(
+ source = zope.schema.Text(
title=u"Source",
description=u"""The source of the page template.""",
required=True)
@@ -70,11 +70,11 @@
__implements__ = IZPTPage, IRenderZPTPage
def getSource(self):
- '''See interface Zope.App.OFS.ZPTPage.ZPTPage.IZPTPage'''
+ '''See IZPTPage'''
return self.read()
def setSource(self, text, content_type='text/html'):
- '''See interface Zope.App.OFS.ZPTPage.ZPTPage.IZPTPage'''
+ '''See IZPTPage'''
if not isinstance(text, unicode):
raise TypeError("source text must be Unicode")