[Checkins] SVN: Zope3/branches/jim-adapter/src/ Adjust to new
package location of zope.app.size.
Philipp von Weitershausen
philikon at philikon.de
Mon Apr 3 04:18:26 EDT 2006
Log message for revision 66349:
Adjust to new package location of zope.app.size.
Changed:
U Zope3/branches/jim-adapter/src/bugtracker/browser/bug.py
U Zope3/branches/jim-adapter/src/bugtracker/tests/placelesssetup.py
U Zope3/branches/jim-adapter/src/z3checkins/configure.zcml
U Zope3/branches/jim-adapter/src/z3checkins/folder.py
U Zope3/branches/jim-adapter/src/z3checkins/tests/test_message.py
U Zope3/branches/jim-adapter/src/zope/app/PACKAGE.cfg
U Zope3/branches/jim-adapter/src/zope/app/applicationcontrol/browser/zodbcontrol.py
U Zope3/branches/jim-adapter/src/zope/app/configure.zcml
U Zope3/branches/jim-adapter/src/zope/app/container/browser/contents.py
U Zope3/branches/jim-adapter/src/zope/app/container/configure.zcml
U Zope3/branches/jim-adapter/src/zope/app/container/size.py
U Zope3/branches/jim-adapter/src/zope/app/container/tests/test_size.py
U Zope3/branches/jim-adapter/src/zope/app/dav/adapter.py
U Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_adapter.py
U Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_propfind.py
U Zope3/branches/jim-adapter/src/zope/app/file/browser/image.py
U Zope3/branches/jim-adapter/src/zope/app/file/configure.zcml
U Zope3/branches/jim-adapter/src/zope/app/file/image.py
U Zope3/branches/jim-adapter/src/zope/app/file/tests/test_image.py
U Zope3/branches/jim-adapter/src/zope/app/i18nfile/browser/i18nimage.py
U Zope3/branches/jim-adapter/src/zope/app/locking/configure.zcml
U Zope3/branches/jim-adapter/src/zope/app/locking/storage.py
U Zope3/branches/jim-adapter/src/zope/app/pagetemplate/talesapi.py
U Zope3/branches/jim-adapter/src/zope/app/pagetemplate/tests/test_talesapi.py
U Zope3/branches/jim-adapter/src/zope/app/zptpage/configure.zcml
U Zope3/branches/jim-adapter/src/zope/app/zptpage/tests/test_zptpage.py
U Zope3/branches/jim-adapter/src/zope/app/zptpage/zptpage.py
U Zope3/branches/jim-adapter/src/zope/viewlet/README.txt
-=-
Modified: Zope3/branches/jim-adapter/src/bugtracker/browser/bug.py
===================================================================
--- Zope3/branches/jim-adapter/src/bugtracker/browser/bug.py 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/bugtracker/browser/bug.py 2006-04-03 08:18:22 UTC (rev 66349)
@@ -25,12 +25,12 @@
from zope.schema.vocabulary import getVocabularyRegistry
from zope.security.checker import getChecker
from zope.structuredtext.html import HTML
+from zope.size.interfaces import ISized
from zope.app import zapi
from zope.app.dublincore.interfaces import IZopeDublinCore
from zope.app.form import CustomWidgetFactory
from zope.app.form.browser import TextWidget, TextAreaWidget, DropdownWidget
-from zope.app.size.interfaces import ISized
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
from bugtracker.interfaces import IComment
Modified: Zope3/branches/jim-adapter/src/bugtracker/tests/placelesssetup.py
===================================================================
--- Zope3/branches/jim-adapter/src/bugtracker/tests/placelesssetup.py 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/bugtracker/tests/placelesssetup.py 2006-04-03 08:18:22 UTC (rev 66349)
@@ -24,6 +24,8 @@
from zope.component.interfaces import IFactory
from zope.interface import classImplements, implements
from zope.schema.vocabulary import getVocabularyRegistry
+from zope.size.interfaces import ISized
+from zope.size import DefaultSized
from zope.app import zapi
from zope.app.testing import ztapi
@@ -41,11 +43,9 @@
from zope.app.renderer.plaintext import PlainTextToHTMLRenderer
from zope.app.renderer.plaintext import PlainTextSourceFactory
from zope.app.security.interfaces import IAuthentication
-from zope.app.size.interfaces import ISized
from zope.app.traversing.interfaces import IContainmentRoot, ITraverser
from zope.app.traversing.interfaces import ITraversable, IPhysicallyLocatable
from zope.app.security.principalregistry import principalRegistry
-from zope.app.size import DefaultSized
from zope.app.traversing.adapters import DefaultTraversable, Traverser
from zope.app.traversing.interfaces import IPhysicallyLocatable
Modified: Zope3/branches/jim-adapter/src/z3checkins/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/z3checkins/configure.zcml 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/z3checkins/configure.zcml 2006-04-03 08:18:22 UTC (rev 66349)
@@ -61,7 +61,7 @@
<adapter for=".interfaces.IMessage"
factory=".folder.MessageSized"
permission="zope.View"
- provides="zope.app.size.interfaces.ISized" />
+ provides="zope.size.interfaces.ISized" />
<utility factory=".message.CheckinMessageParser"
Modified: Zope3/branches/jim-adapter/src/z3checkins/folder.py
===================================================================
--- Zope3/branches/jim-adapter/src/z3checkins/folder.py 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/z3checkins/folder.py 2006-04-03 08:18:22 UTC (rev 66349)
@@ -8,10 +8,10 @@
from persistent.list import PersistentList
from zope.interface import implements
+from zope.size.interfaces import ISized
from zope.app.container.btree import BTreeContainer
from zope.app.container.interfaces import INameChooser
from zope.app.container.interfaces import IContainerNamesContainer
-from zope.app.size.interfaces import ISized
from z3checkins.interfaces import ICheckinFolder, IMessage
Modified: Zope3/branches/jim-adapter/src/z3checkins/tests/test_message.py
===================================================================
--- Zope3/branches/jim-adapter/src/z3checkins/tests/test_message.py 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/z3checkins/tests/test_message.py 2006-04-03 08:18:22 UTC (rev 66349)
@@ -268,7 +268,7 @@
def test_interface(self):
from z3checkins.folder import MessageSized
- from zope.app.size.interfaces import ISized
+ from zope.size.interfaces import ISized
self.assert_(ISized.providedBy(MessageSized(MessageStub())))
def test_sizeForSorting(self):
Modified: Zope3/branches/jim-adapter/src/zope/app/PACKAGE.cfg
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/PACKAGE.cfg 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/zope/app/PACKAGE.cfg 2006-04-03 08:18:22 UTC (rev 66349)
@@ -71,7 +71,6 @@
security
servicenames.py
site
-size
tests
testing
# This should go into the (new) datetimeutils package
Modified: Zope3/branches/jim-adapter/src/zope/app/applicationcontrol/browser/zodbcontrol.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/applicationcontrol/browser/zodbcontrol.py 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/zope/app/applicationcontrol/browser/zodbcontrol.py 2006-04-03 08:18:22 UTC (rev 66349)
@@ -19,7 +19,7 @@
from ZODB.FileStorage.FileStorage import FileStorageError
from zope.app.i18n import ZopeMessageFactory as _
-from zope.app.size import byteDisplay
+from zope.size import byteDisplay
class ZODBControlView(object):
Modified: Zope3/branches/jim-adapter/src/zope/app/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/configure.zcml 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/zope/app/configure.zcml 2006-04-03 08:18:22 UTC (rev 66349)
@@ -25,7 +25,7 @@
<include file="menus.zcml" />
<include package="zope.app.copypastemove" />
- <include package="zope.app.size" />
+ <include package="zope.size" />
<include package="zope.app.location" />
<include package="zope.app.container" />
Modified: Zope3/branches/jim-adapter/src/zope/app/container/browser/contents.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/container/browser/contents.py 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/zope/app/container/browser/contents.py 2006-04-03 08:18:22 UTC (rev 66349)
@@ -23,9 +23,9 @@
from zope.app.traversing.interfaces import TraversalError
from zope.security.interfaces import Unauthorized
from zope.security import canWrite
+from zope.size.interfaces import ISized
from zope.app import zapi
-from zope.app.size.interfaces import ISized
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
from zope.app.publisher.browser import BrowserView
from zope.app.i18n import ZopeMessageFactory as _
Modified: Zope3/branches/jim-adapter/src/zope/app/container/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/container/configure.zcml 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/zope/app/container/configure.zcml 2006-04-03 08:18:22 UTC (rev 66349)
@@ -33,7 +33,7 @@
<adapter
factory="zope.app.container.size.ContainerSized"
- provides="zope.app.size.interfaces.ISized"
+ provides="zope.size.interfaces.ISized"
for="zope.app.container.interfaces.IReadContainer"
/>
Modified: Zope3/branches/jim-adapter/src/zope/app/container/size.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/container/size.py 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/zope/app/container/size.py 2006-04-03 08:18:22 UTC (rev 66349)
@@ -19,7 +19,7 @@
__docformat__ = 'restructuredtext'
from zope.app.i18n import ZopeMessageFactory as _
-from zope.app.size.interfaces import ISized
+from zope.size.interfaces import ISized
from zope.interface import implements
class ContainerSized(object):
Modified: Zope3/branches/jim-adapter/src/zope/app/container/tests/test_size.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/container/tests/test_size.py 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/zope/app/container/tests/test_size.py 2006-04-03 08:18:22 UTC (rev 66349)
@@ -17,9 +17,9 @@
"""
import unittest
-from zope.app.size.interfaces import ISized
+from zope.interface import implements
+from zope.size.interfaces import ISized
from zope.app.container.interfaces import IContainer
-from zope.interface import implements
class DummyContainer(object):
Modified: Zope3/branches/jim-adapter/src/zope/app/dav/adapter.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/adapter.py 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/adapter.py 2006-04-03 08:18:22 UTC (rev 66349)
@@ -21,12 +21,12 @@
from zope.interface import implements
from zope.i18n import translate
+from zope.size.interfaces import ISized
from zope.app import zapi
from zope.app.dav.interfaces import IDAVSchema
from zope.app.dublincore.interfaces import IDCTimes
from zope.app.filerepresentation.interfaces import IReadDirectory
-from zope.app.size.interfaces import ISized
from zope.app.file.interfaces import IFile
class DAVSchemaAdapter(object):
Modified: Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_adapter.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_adapter.py 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_adapter.py 2006-04-03 08:18:22 UTC (rev 66349)
@@ -19,10 +19,10 @@
from zope.testing.doctestunit import DocTestSuite
from zope.interface import Interface, implements
+from zope.size.interfaces import ISized
from zope.app.testing import ztapi
from zope.app.testing.placelesssetup import setUp, tearDown
-from zope.app.size.interfaces import ISized
from zope.app.filerepresentation.interfaces import IReadDirectory
from zope.app.i18n import ZopeMessageFactory as _
Modified: Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_propfind.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_propfind.py 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_propfind.py 2006-04-03 08:18:22 UTC (rev 66349)
@@ -26,6 +26,7 @@
from zope.pagetemplate.tests.util import normalize_xml
from zope.schema import getFieldNamesInOrder
from zope.schema.interfaces import IText, ITextLine, IDatetime, ISequence
+from zope.size.interfaces import ISized
from zope.app import zapi
from zope.app.testing import ztapi
@@ -39,7 +40,6 @@
from zope.app.dublincore.annotatableadapter import ZDCAnnotatableAdapter
from zope.app.annotation.interfaces import IAnnotatable, IAnnotations
from zope.app.annotation.attribute import AttributeAnnotations
-from zope.app.size.interfaces import ISized
from zope.app.file.interfaces import IFile
from zope.app.dav import propfind
Modified: Zope3/branches/jim-adapter/src/zope/app/file/browser/image.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/file/browser/image.py 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/zope/app/file/browser/image.py 2006-04-03 08:18:22 UTC (rev 66349)
@@ -17,7 +17,7 @@
"""
__docformat__ = 'restructuredtext'
-from zope.app.size.interfaces import ISized
+from zope.size.interfaces import ISized
class ImageData(object):
Modified: Zope3/branches/jim-adapter/src/zope/app/file/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/file/configure.zcml 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/zope/app/file/configure.zcml 2006-04-03 08:18:22 UTC (rev 66349)
@@ -70,7 +70,7 @@
<adapter
factory=".image.ImageSized"
- provides="zope.app.size.interfaces.ISized"
+ provides="zope.size.interfaces.ISized"
for=".interfaces.IImage"
/>
Modified: Zope3/branches/jim-adapter/src/zope/app/file/image.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/file/image.py 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/zope/app/file/image.py 2006-04-03 08:18:22 UTC (rev 66349)
@@ -21,15 +21,14 @@
from cStringIO import StringIO
from zope.interface import implements
+from zope.size.interfaces import ISized
+from zope.size import byteDisplay
-from zope.app.size.interfaces import ISized
-from zope.app.size import byteDisplay
from zope.app.contenttypes import guess_content_type
from zope.app.i18n import ZopeMessageFactory as _
+from zope.app.file.file import File
+from zope.app.file.interfaces import IImage
-from file import File
-from interfaces import IImage
-
class Image(File):
implements(IImage)
Modified: Zope3/branches/jim-adapter/src/zope/app/file/tests/test_image.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/file/tests/test_image.py 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/zope/app/file/tests/test_image.py 2006-04-03 08:18:22 UTC (rev 66349)
@@ -131,7 +131,7 @@
class TestSized(unittest.TestCase):
def testInterface(self):
- from zope.app.size.interfaces import ISized
+ from zope.size.interfaces import ISized
self.failUnless(ISized.implementedBy(ImageSized))
self.failUnless(verifyClass(ISized, ImageSized))
Modified: Zope3/branches/jim-adapter/src/zope/app/i18nfile/browser/i18nimage.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/i18nfile/browser/i18nimage.py 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/zope/app/i18nfile/browser/i18nimage.py 2006-04-03 08:18:22 UTC (rev 66349)
@@ -20,10 +20,10 @@
from urllib import quote
from zope.i18n.negotiator import negotiator
+from zope.size import ISized
from zope.app.i18n import ZopeMessageFactory as _
from zope.app.file.browser.image import ImageData
-from zope.app.size import ISized
class I18nImageEdit(object):
Modified: Zope3/branches/jim-adapter/src/zope/app/locking/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/locking/configure.zcml 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/zope/app/locking/configure.zcml 2006-04-03 08:18:22 UTC (rev 66349)
@@ -47,7 +47,7 @@
<class class=".storage.Sized">
<require
permission="zope.Public"
- interface="zope.app.size.interfaces.ISized"
+ interface="zope.size.interfaces.ISized"
/>
</class>
Modified: Zope3/branches/jim-adapter/src/zope/app/locking/storage.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/locking/storage.py 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/zope/app/locking/storage.py 2006-04-03 08:18:22 UTC (rev 66349)
@@ -25,12 +25,12 @@
from BTrees.IOBTree import IOBTree
from zope import component, interface
+from zope.size.interfaces import ISized
from zope.app.keyreference.interfaces import IKeyReference
from zope.app.locking import interfaces
# for backwards compatibility:
from zope.app.locking.interfaces import ILockStorage
-from zope.app.size.interfaces import ISized
from zope.app.i18n import ZopeMessageFactory as _
Modified: Zope3/branches/jim-adapter/src/zope/app/pagetemplate/talesapi.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/pagetemplate/talesapi.py 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/zope/app/pagetemplate/talesapi.py 2006-04-03 08:18:22 UTC (rev 66349)
@@ -17,16 +17,17 @@
"""
__docformat__ = 'restructuredtext'
-from zope.app.dublincore.interfaces import IDCDescriptiveProperties
-from zope.app.dublincore.interfaces import IDCTimes
-from zope.app.dublincore.interfaces import IZopeDublinCore
-from zope.app.size.interfaces import ISized
-from zope.app import zapi
from zope.interface import implements
+from zope.size.interfaces import ISized
from zope.security.interfaces import Unauthorized
from zope.tales.interfaces import ITALESFunctionNamespace
+from zope.app import zapi
+from zope.app.dublincore.interfaces import IDCDescriptiveProperties
+from zope.app.dublincore.interfaces import IDCTimes
+from zope.app.dublincore.interfaces import IZopeDublinCore
+
class ZopeTalesAPI(object):
implements(IDCTimes, IDCDescriptiveProperties, ITALESFunctionNamespace)
Modified: Zope3/branches/jim-adapter/src/zope/app/pagetemplate/tests/test_talesapi.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/pagetemplate/tests/test_talesapi.py 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/zope/app/pagetemplate/tests/test_talesapi.py 2006-04-03 08:18:22 UTC (rev 66349)
@@ -15,12 +15,13 @@
$Id$
"""
+from datetime import datetime
from zope.testing.doctestunit import DocTestSuite
from zope.interface import implements
+from zope.size.interfaces import ISized
+
from zope.app.dublincore.interfaces import IZopeDublinCore
-from zope.app.size.interfaces import ISized
from zope.app.traversing.interfaces import IPhysicallyLocatable
-from datetime import datetime
from zope.app.pagetemplate.talesapi import ZopeTalesAPI
class TestObject(object):
Modified: Zope3/branches/jim-adapter/src/zope/app/zptpage/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/zptpage/configure.zcml 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/zope/app/zptpage/configure.zcml 2006-04-03 08:18:22 UTC (rev 66349)
@@ -56,7 +56,7 @@
<adapter
for=".interfaces.IZPTPage"
- provides="zope.app.size.interfaces.ISized"
+ provides="zope.size.interfaces.ISized"
factory=".zptpage.Sized"
trusted="y"
permission="zope.ManageContent"
Modified: Zope3/branches/jim-adapter/src/zope/app/zptpage/tests/test_zptpage.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/zptpage/tests/test_zptpage.py 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/zope/app/zptpage/tests/test_zptpage.py 2006-04-03 08:18:22 UTC (rev 66349)
@@ -168,7 +168,7 @@
class SizedTests(unittest.TestCase):
def testInterface(self):
- from zope.app.size.interfaces import ISized
+ from zope.size.interfaces import ISized
self.failUnless(ISized.implementedBy(Sized))
self.failUnless(verifyClass(ISized, Sized))
Modified: Zope3/branches/jim-adapter/src/zope/app/zptpage/zptpage.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/zptpage/zptpage.py 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/zope/app/zptpage/zptpage.py 2006-04-03 08:18:22 UTC (rev 66349)
@@ -20,10 +20,10 @@
from zope.security.proxy import ProxyFactory
from zope.interface import implements
from zope.pagetemplate.pagetemplate import PageTemplate
+from zope.size.interfaces import ISized
from zope.app.pagetemplate.engine import AppPT
from zope.app.i18n import ZopeMessageFactory as _
-from zope.app.size.interfaces import ISized
from zope.app.filerepresentation.interfaces import IReadFile, IWriteFile
from zope.app.filerepresentation.interfaces import IFileFactory
from zope.app.container.contained import Contained
Modified: Zope3/branches/jim-adapter/src/zope/viewlet/README.txt
===================================================================
--- Zope3/branches/jim-adapter/src/zope/viewlet/README.txt 2006-04-03 08:16:56 UTC (rev 66348)
+++ Zope3/branches/jim-adapter/src/zope/viewlet/README.txt 2006-04-03 08:18:22 UTC (rev 66349)
@@ -417,7 +417,7 @@
Since we want to also provide the size of a file, here a simple implementation
of the ``ISized`` interface:
- >>> from zope.app import size
+ >>> from zope import size
>>> class FileSized(object):
... zope.interface.implements(size.interfaces.ISized)
... zope.component.adapts(IFile)
More information about the Checkins
mailing list