[Zope3-checkins] CVS: Zope3/src/zope/app/content - configure.zcml:1.1.2.5 file.py:1.1.2.5 i18nimage.py:1.1.2.6 image.py:1.1.2.4
Jim Fulton
jim@zope.com
Wed, 25 Dec 2002 08:28:00 -0500
Update of /cvs-repository/Zope3/src/zope/app/content
In directory cvs.zope.org:/tmp/cvs-serv9989/src/zope/app/content
Modified Files:
Tag: NameGeddon-branch
configure.zcml file.py i18nimage.py image.py
Log Message:
Gor zope running again!
I haven't tested everything.
(Yes, we need functional tests. Maybe this week).
Good enough to merge into trunk.
=== Zope3/src/zope/app/content/configure.zcml 1.1.2.4 => 1.1.2.5 ===
--- Zope3/src/zope/app/content/configure.zcml:1.1.2.4 Tue Dec 24 14:26:47 2002
+++ Zope3/src/zope/app/content/configure.zcml Wed Dec 25 08:27:29 2002
@@ -9,7 +9,9 @@
<implements interface="zope.app.interfaces.container.IContentContainer" />
- <implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
+ <implements
+ interface="zope.app.interfaces.annotation.IAttributeAnnotatable"
+ />
<factory
id="Folder"
@@ -46,7 +48,9 @@
<require like_class="zope.app.content.folder.Folder" />
- <implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
+ <implements
+ interface="zope.app.interfaces.annotation.IAttributeAnnotatable"
+ />
</content>
@@ -72,7 +76,9 @@
set_schema="zope.app.interfaces.content.file.IReadFile"
/>
- <implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
+ <implements
+ interface="zope.app.interfaces.annotation.IAttributeAnnotatable"
+ />
</content>
@@ -97,7 +103,9 @@
permission="zope.ManageContent"
attributes="setDefaultLanguage removeLanguage" />
- <implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
+ <implements
+ interface="zope.app.interfaces.annotation.IAttributeAnnotatable"
+ />
</content>
@@ -134,9 +142,10 @@
<implements
interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
-</content>
-<adapter factory="zope.app.content.zpt.SearchableText"
+ </content>
+
+ <adapter factory="zope.app.content.zpt.SearchableText"
provides="zope.app.interfaces.index.text.interfaces.ISearchableText"
for="zope.app.content.zpt.IZPTPage" />
@@ -164,54 +173,59 @@
</content>
-<content class="zope.app.content.file.File">
-
- <factory
- id="File"
- permission="zope.ManageContent"
- title="File"
- description="A File" />
-
- <require
- permission="zope.View"
- interface="zope.app.interfaces.content.file.IReadFile" />
+ <content class="zope.app.content.file.File">
- <require
- permission="zope.ManageContent"
- interface="zope.app.interfaces.content.file.IWriteFile"
- set_schema="zope.app.interfaces.content.file.IReadFile"
- />
+ <factory
+ id="File"
+ permission="zope.ManageContent"
+ title="File"
+ description="A File" />
- <implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
+ <require
+ permission="zope.View"
+ interface="zope.app.interfaces.content.file.IReadFile" />
-</content>
+ <require
+ permission="zope.ManageContent"
+ interface="zope.app.interfaces.content.file.IWriteFile"
+ set_schema="zope.app.interfaces.content.file.IReadFile"
+ />
-<content class="zope.app.content.i18nfile.I18nFile">
- <factory
- id="zope.app.content.I18nFile"
- permission="zope.ManageContent"
- title="I18n File"
- description="An Internationalized File" />
- <require
- permission="zope.View"
- interface="zope.app.interfaces.content.file.IReadFile" />
- <require
- permission="zope.ManageContent"
- interface="zope.app.interfaces.content.file.IWriteFile" />
- <require
- permission="zope.View"
- attributes="getDefaultLanguage getAvailableLanguages" />
- <require
- permission="zope.ManageContent"
- attributes="setDefaultLanguage removeLanguage" />
+ <implements
+ interface="zope.app.interfaces.annotation.IAttributeAnnotatable"
+ />
- <implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
+ </content>
-</content>
+ <content class="zope.app.content.i18nfile.I18nFile">
-<adapter factory="zope.app.content.file.SearchableText"
- provides="zope.app.interfaces.index.text.interfaces.ISearchableText"
- for="zope.app.interfaces.content.file.IReadFile" />
+ <factory
+ id="zope.app.content.I18nFile"
+ permission="zope.ManageContent"
+ title="I18n File"
+ description="An Internationalized File" />
+ <require
+ permission="zope.View"
+ interface="zope.app.interfaces.content.file.IReadFile" />
+ <require
+ permission="zope.ManageContent"
+ interface="zope.app.interfaces.content.file.IWriteFile" />
+ <require
+ permission="zope.View"
+ attributes="getDefaultLanguage getAvailableLanguages" />
+ <require
+ permission="zope.ManageContent"
+ attributes="setDefaultLanguage removeLanguage" />
+
+ <implements
+ interface="zope.app.interfaces.annotation.IAttributeAnnotatable"
+ />
+
+ </content>
+
+ <adapter factory="zope.app.content.file.SearchableText"
+ provides="zope.app.interfaces.index.text.interfaces.ISearchableText"
+ for="zope.app.interfaces.content.file.IReadFile" />
<!-- SQL Script Directives -->
=== Zope3/src/zope/app/content/file.py 1.1.2.4 => 1.1.2.5 ===
--- Zope3/src/zope/app/content/file.py:1.1.2.4 Tue Dec 24 21:20:24 2002
+++ Zope3/src/zope/app/content/file.py Wed Dec 25 08:27:29 2002
@@ -25,7 +25,6 @@
from zope.publisher.browser import FileUpload
from zope.app.interfaces.dublincore import IZopeDublinCore
-from zope.app.interfaces.annotation import IAnnotatable
from zope.app.interfaces.content.file import IFile, IReadFile
@@ -33,7 +32,7 @@
MAXCHUNKSIZE = 1 << 16
class File(Persistent):
- __implements__ = IFile, IAnnotatable
+ __implements__ = IFile
def __init__(self, data='', contentType=''):
self.data = data
=== Zope3/src/zope/app/content/i18nimage.py 1.1.2.5 => 1.1.2.6 ===
--- Zope3/src/zope/app/content/i18nimage.py:1.1.2.5 Tue Dec 24 21:20:24 2002
+++ Zope3/src/zope/app/content/i18nimage.py Wed Dec 25 08:27:29 2002
@@ -17,24 +17,15 @@
"""
from zope.app.content.image import IImage, Image, getImageInfo
-from zope.app.interfaces.content.i18nfile import II18nFile
from zope.app.content.i18nfile import I18nFile
-from zope.app.interfaces.annotation import IAnnotatable
-
-
-class II18nImage(II18nFile, IImage):
- """I18n aware image interface."""
-
+from zope.app.interfaces.content.i18nimage import II18nImage
class I18nImage(I18nFile):
"""An internationalized Image object. Note that images of all
languages share the same content type.
"""
- __implements__ = (
- II18nImage,
- IAnnotatable,
- )
+ __implements__ = II18nImage
def _create(self, data):
=== Zope3/src/zope/app/content/image.py 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zope/app/content/image.py:1.1.2.3 Tue Dec 24 21:20:24 2002
+++ Zope3/src/zope/app/content/image.py Wed Dec 25 08:27:29 2002
@@ -15,22 +15,12 @@
$Id$
"""
import struct
-
from zope.app.content.file import File
-from zope.app.interfaces.content.file import IFile
-from zope.app.interfaces.annotation import IAnnotatable
from cStringIO import StringIO
-
-
-class IImage(IFile):
- """This interface defines an Image that can be displayed."""
-
- def getImageSize():
- """Return a tuple (x, y) that describes the dimensions of
- the object."""
+from zope.app.interfaces.content.image import IImage
class Image(File):
- __implements__ = IImage, IAnnotatable
+ __implements__ = IImage
def __init__(self, data=None):
'''See interface IFile'''