[Checkins] SVN: Zope3/branches/jim-adapter/src/zope/app/ Fix up
zope.app after moving zope.app.filerepresentation to
zope.filerepresentation
Philipp von Weitershausen
philikon at philikon.de
Wed Apr 12 17:03:02 EDT 2006
Log message for revision 66911:
Fix up zope.app after moving zope.app.filerepresentation to zope.filerepresentation
Changed:
U Zope3/branches/jim-adapter/src/zope/app/component/configure.zcml
U Zope3/branches/jim-adapter/src/zope/app/component/site.py
U Zope3/branches/jim-adapter/src/zope/app/container/configure.zcml
U Zope3/branches/jim-adapter/src/zope/app/container/directory.py
U Zope3/branches/jim-adapter/src/zope/app/dav/adapter.py
U Zope3/branches/jim-adapter/src/zope/app/dav/mkcol.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_mkcol.py
U Zope3/branches/jim-adapter/src/zope/app/dav/tests/unitfixtures.py
U Zope3/branches/jim-adapter/src/zope/app/dtmlpage/configure.zcml
U Zope3/branches/jim-adapter/src/zope/app/dtmlpage/dtmlpage.py
U Zope3/branches/jim-adapter/src/zope/app/externaleditor/browser/__init__.py
U Zope3/branches/jim-adapter/src/zope/app/externaleditor/interfaces.py
U Zope3/branches/jim-adapter/src/zope/app/externaleditor/tests/test_external_edit.py
U Zope3/branches/jim-adapter/src/zope/app/file/configure.zcml
U Zope3/branches/jim-adapter/src/zope/app/folder/configure.zcml
U Zope3/branches/jim-adapter/src/zope/app/fssync/committer.py
U Zope3/branches/jim-adapter/src/zope/app/fssync/tests/test_committer.py
U Zope3/branches/jim-adapter/src/zope/app/ftp/README.txt
U Zope3/branches/jim-adapter/src/zope/app/ftp/__init__.py
U Zope3/branches/jim-adapter/src/zope/app/ftp/tests/test_ftpview.py
U Zope3/branches/jim-adapter/src/zope/app/http/delete.py
U Zope3/branches/jim-adapter/src/zope/app/http/put.py
U Zope3/branches/jim-adapter/src/zope/app/http/tests/test_delete.py
U Zope3/branches/jim-adapter/src/zope/app/http/tests/test_put.py
U Zope3/branches/jim-adapter/src/zope/app/module/configure.zcml
U Zope3/branches/jim-adapter/src/zope/app/module/manager.py
U Zope3/branches/jim-adapter/src/zope/app/zptpage/configure.zcml
U Zope3/branches/jim-adapter/src/zope/app/zptpage/zptpage.py
-=-
Modified: Zope3/branches/jim-adapter/src/zope/app/component/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/component/configure.zcml 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/component/configure.zcml 2006-04-12 21:02:57 UTC (rev 66911)
@@ -90,7 +90,7 @@
<adapter
for="zope.component.interfaces.IComponentLookup"
- provides="zope.app.filerepresentation.interfaces.IDirectoryFactory"
+ provides="zope.filerepresentation.interfaces.IDirectoryFactory"
factory=".site.SMFolderFactory"
permission="zope.ManageContent"
/>
Modified: Zope3/branches/jim-adapter/src/zope/app/component/site.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/component/site.py 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/component/site.py 2006-04-12 21:02:57 UTC (rev 66911)
@@ -40,6 +40,7 @@
from zope.traversing.interfaces import IContainmentRoot
from zope.security.proxy import removeSecurityProxy
from zope.lifecycleevent import ObjectCreatedEvent
+from zope.filerepresentation.interfaces import IDirectoryFactory
import zope.app.component.back35
from zope.app import zapi
@@ -48,7 +49,6 @@
from zope.app.component.hooks import setSite
from zope.app.container.btree import BTreeContainer
from zope.app.container.contained import Contained
-from zope.app.filerepresentation.interfaces import IDirectoryFactory
##############################################################################
# from zope.app.module import resolve
Modified: Zope3/branches/jim-adapter/src/zope/app/container/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/container/configure.zcml 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/container/configure.zcml 2006-04-12 21:02:57 UTC (rev 66911)
@@ -14,13 +14,13 @@
<adapter
for=".interfaces.IReadContainer"
- provides="zope.app.filerepresentation.interfaces.IReadDirectory"
+ provides="zope.filerepresentation.interfaces.IReadDirectory"
factory=".directory.noop"
/>
<adapter
for=".interfaces.IWriteContainer"
- provides="zope.app.filerepresentation.interfaces.IWriteDirectory"
+ provides="zope.filerepresentation.interfaces.IWriteDirectory"
factory=".directory.noop"
/>
Modified: Zope3/branches/jim-adapter/src/zope/app/container/directory.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/container/directory.py 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/container/directory.py 2006-04-12 21:02:57 UTC (rev 66911)
@@ -25,7 +25,7 @@
"""
__docformat__ = 'restructuredtext'
-import zope.app.filerepresentation.interfaces
+import zope.filerepresentation.interfaces
from zope.security.proxy import removeSecurityProxy
from zope.interface import implements
@@ -45,7 +45,7 @@
of the same class as it's context.
"""
- implements(zope.app.filerepresentation.interfaces.IDirectoryFactory)
+ implements(zope.filerepresentation.interfaces.IDirectoryFactory)
def __init__(self, context):
self.context = context
Modified: Zope3/branches/jim-adapter/src/zope/app/dav/adapter.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/adapter.py 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/adapter.py 2006-04-12 21:02:57 UTC (rev 66911)
@@ -23,10 +23,10 @@
from zope.i18n import translate
from zope.size.interfaces import ISized
from zope.dublincore.interfaces import IDCTimes
+from zope.filerepresentation.interfaces import IReadDirectory
+from zope.traversing.api import getName
-from zope.app import zapi
from zope.app.dav.interfaces import IDAVSchema
-from zope.app.filerepresentation.interfaces import IReadDirectory
from zope.app.file.interfaces import IFile
class DAVSchemaAdapter(object):
@@ -38,7 +38,7 @@
self.context = object
def displayname(self):
- value = zapi.name(self.context)
+ value = getName(self.context)
if IReadDirectory(self.context, None) is not None:
value = value + '/'
return value
Modified: Zope3/branches/jim-adapter/src/zope/app/dav/mkcol.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/mkcol.py 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/mkcol.py 2006-04-12 21:02:57 UTC (rev 66911)
@@ -15,8 +15,8 @@
"""
__docformat__ = 'restructuredtext'
-from zope.app.filerepresentation.interfaces import IWriteDirectory
-from zope.app.filerepresentation.interfaces import IDirectoryFactory
+from zope.filerepresentation.interfaces import IWriteDirectory
+from zope.filerepresentation.interfaces import IDirectoryFactory
from zope.event import notify
from zope.lifecycleevent import ObjectCreatedEvent
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-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_adapter.py 2006-04-12 21:02:57 UTC (rev 66911)
@@ -29,10 +29,10 @@
from zope.annotation.attribute import AttributeAnnotations
from zope.dublincore.interfaces import IWriteZopeDublinCore
from zope.dublincore.annotatableadapter import ZDCAnnotatableAdapter
+from zope.filerepresentation.interfaces import IReadDirectory
from zope.app.testing import ztapi
from zope.app.testing.placelesssetup import setUp, tearDown
-from zope.app.filerepresentation.interfaces import IReadDirectory
from zope.app.i18n import ZopeMessageFactory as _
class IRobot(Interface):
Modified: Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_mkcol.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_mkcol.py 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_mkcol.py 2006-04-12 21:02:57 UTC (rev 66911)
@@ -17,17 +17,14 @@
"""
from unittest import TestCase, TestSuite, main, makeSuite
from zope.traversing.api import traverse
+from zope.filerepresentation.interfaces import IWriteDirectory
+from zope.filerepresentation.interfaces import IDirectoryFactory
+
from zope.app.testing import ztapi
from zope.app.component.testing import PlacefulSetup
-
from zope.app.container.interfaces import IWriteContainer
-from zope.app.filerepresentation.interfaces import IWriteDirectory
-from zope.app.container.directory import noop
-
+from zope.app.container.directory import noop, Cloner
from zope.app.folder.interfaces import IFolder
-from zope.app.filerepresentation.interfaces import IDirectoryFactory
-from zope.app.container.directory import Cloner
-
from zope.app.http.put import NullResource
from zope.app.dav import mkcol
from zope.app.dav.tests.test_propfind import _createRequest, File
Modified: Zope3/branches/jim-adapter/src/zope/app/dav/tests/unitfixtures.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/tests/unitfixtures.py 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/tests/unitfixtures.py 2006-04-12 21:02:57 UTC (rev 66911)
@@ -21,9 +21,9 @@
from persistent import Persistent
from zope.interface import implements
from zope.annotation.interfaces import IAnnotatable
+from zope.filerepresentation.interfaces import IWriteFile
+from zope.filerepresentation.interfaces import IReadDirectory
-from zope.app.filerepresentation.interfaces import IWriteFile
-from zope.app.filerepresentation.interfaces import IReadDirectory
from zope.app.container.interfaces import IReadContainer
from zope.app.file.interfaces import IFile
Modified: Zope3/branches/jim-adapter/src/zope/app/dtmlpage/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dtmlpage/configure.zcml 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/dtmlpage/configure.zcml 2006-04-12 21:02:57 UTC (rev 66911)
@@ -39,7 +39,7 @@
<adapter
for="zope.app.folder.interfaces.IFolder"
- provides="zope.app.filerepresentation.interfaces.IFileFactory"
+ provides="zope.filerepresentation.interfaces.IFileFactory"
name=".dtml"
factory=".dtmlpage.DTMLFactory"
permission="zope.ManageContent"
Modified: Zope3/branches/jim-adapter/src/zope/app/dtmlpage/dtmlpage.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dtmlpage/dtmlpage.py 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/dtmlpage/dtmlpage.py 2006-04-12 21:02:57 UTC (rev 66911)
@@ -22,8 +22,8 @@
from zope.documenttemplate.untrusted import UntrustedHTML
from zope.interface import implements
from zope.annotation.interfaces import IAnnotatable
+from zope.filerepresentation.interfaces import IFileFactory
-from zope.app.filerepresentation.interfaces import IFileFactory
from zope.app.container.contained import Contained
from zope.app.publication.interfaces import IFileContent
Modified: Zope3/branches/jim-adapter/src/zope/app/externaleditor/browser/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/externaleditor/browser/__init__.py 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/externaleditor/browser/__init__.py 2006-04-12 21:02:57 UTC (rev 66911)
@@ -17,9 +17,9 @@
from zope.publisher.browser import BrowserView
from zope.security.proxy import removeSecurityProxy
+from zope.filerepresentation.interfaces import IReadFile
+from zope.traversing.browser import absoluteURL
-from zope.app import zapi
-from zope.app.filerepresentation.interfaces import IReadFile
from zope.app.interface import queryType
from zope.app.content.interfaces import IContentType
@@ -31,7 +31,7 @@
response = request.response
r = []
- url = zapi.absoluteURL(context, request)
+ url = absoluteURL(context, request)
r.append('url:%s' % url)
adapted = IReadFile(context)
Modified: Zope3/branches/jim-adapter/src/zope/app/externaleditor/interfaces.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/externaleditor/interfaces.py 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/externaleditor/interfaces.py 2006-04-12 21:02:57 UTC (rev 66911)
@@ -29,11 +29,11 @@
site manager that a External Edit action should be available.
2. It needs to have an adapter for the interface
- ``zope.app.filerepresentation.interfaces.IReadFile``.
+ ``zope.filerepresentation.interfaces.IReadFile``.
3. It needs to have a ``PUT`` view which receive the content back from the
External Editor client and update the object, optimally using an
adapter to the interface
- ``zope.app.filerepresentation.interfaces.IWriteFile`` (but not
+ ``zope.filerepresentation.interfaces.IWriteFile`` (but not
necessarily).
"""
Modified: Zope3/branches/jim-adapter/src/zope/app/externaleditor/tests/test_external_edit.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/externaleditor/tests/test_external_edit.py 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/externaleditor/tests/test_external_edit.py 2006-04-12 21:02:57 UTC (rev 66911)
@@ -18,13 +18,13 @@
from zope.interface import implements, Interface, directlyProvides
from zope.publisher.browser import TestRequest
+from zope.filerepresentation.interfaces import IReadFile
from zope.app import zapi
from zope.app.component.testing import PlacefulSetup
from zope.app.testing import ztapi
from zope.app.container.contained import contained
from zope.app.content.interfaces import IContentType
-from zope.app.filerepresentation.interfaces import IReadFile
from zope.app.file.file import File, FileReadFile
from zope.app.externaleditor.interfaces import IExternallyEditable
Modified: Zope3/branches/jim-adapter/src/zope/app/file/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/file/configure.zcml 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/file/configure.zcml 2006-04-12 21:02:57 UTC (rev 66911)
@@ -76,21 +76,21 @@
<adapter
for=".interfaces.IFile"
- provides="zope.app.filerepresentation.interfaces.IReadFile"
+ provides="zope.filerepresentation.interfaces.IReadFile"
factory=".file.FileReadFile"
permission="zope.View"
/>
<adapter
for=".interfaces.IFile"
- provides="zope.app.filerepresentation.interfaces.IWriteFile"
+ provides="zope.filerepresentation.interfaces.IWriteFile"
factory=".file.FileWriteFile"
permission="zope.ManageContent"
/>
<adapter
for="zope.app.folder.interfaces.IFolder"
- provides="zope.app.filerepresentation.interfaces.IFileFactory"
+ provides="zope.filerepresentation.interfaces.IFileFactory"
factory=".image.FileFactory"
permission="zope.ManageContent"
/>
Modified: Zope3/branches/jim-adapter/src/zope/app/folder/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/folder/configure.zcml 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/folder/configure.zcml 2006-04-12 21:02:57 UTC (rev 66911)
@@ -33,14 +33,14 @@
<adapter
for=".interfaces.IFolder"
- provides="zope.app.filerepresentation.interfaces.IDirectoryFactory"
+ provides="zope.filerepresentation.interfaces.IDirectoryFactory"
factory="zope.app.container.directory.Cloner"
permission="zope.ManageContent"
/>
<adapter
for=".interfaces.IFolder"
- provides="zope.app.filerepresentation.interfaces.IReadDirectory"
+ provides="zope.filerepresentation.interfaces.IReadDirectory"
factory=".filerepresentation.ReadDirectory"
permission="zope.View"
/>
Modified: Zope3/branches/jim-adapter/src/zope/app/fssync/committer.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/fssync/committer.py 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/fssync/committer.py 2006-04-12 21:02:57 UTC (rev 66911)
@@ -29,11 +29,11 @@
from zope.xmlpickle import fromxml
from zope.traversing.api import traverseName, getName
from zope.lifecycleevent import ObjectCreatedEvent, ObjectModifiedEvent
+from zope.filerepresentation.interfaces import IFileFactory
+from zope.filerepresentation.interfaces import IDirectoryFactory
from zope.app.fssync import fspickle
from zope.app.container.interfaces import IContainer
-from zope.app.filerepresentation.interfaces import IFileFactory
-from zope.app.filerepresentation.interfaces import IDirectoryFactory
from zope.app.container.contained import contained
class SynchronizationError(Exception):
Modified: Zope3/branches/jim-adapter/src/zope/app/fssync/tests/test_committer.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/fssync/tests/test_committer.py 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/fssync/tests/test_committer.py 2006-04-12 21:02:57 UTC (rev 66911)
@@ -26,6 +26,8 @@
from zope.traversing.interfaces import ITraversable, ITraverser
from zope.xmlpickle import loads, dumps
from zope.location import Location
+from zope.filerepresentation.interfaces import IFileFactory
+from zope.filerepresentation.interfaces import IDirectoryFactory
from zope.fssync import fsutil
from zope.fssync.server.entryadapter import DefaultFileAdpater
@@ -35,8 +37,6 @@
from zope.app.testing import ztapi
from zope.app.container.interfaces import IContainer
-from zope.app.filerepresentation.interfaces import IFileFactory
-from zope.app.filerepresentation.interfaces import IDirectoryFactory
from zope.app.testing.placelesssetup import PlacelessSetup
from zope.app.fssync import committer, syncer # The module
Modified: Zope3/branches/jim-adapter/src/zope/app/ftp/README.txt
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/ftp/README.txt 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/ftp/README.txt 2006-04-12 21:02:57 UTC (rev 66911)
@@ -22,5 +22,5 @@
The view, in turn, uses adapters for the `IReadFile`, `IWriteFile`,
`IReadDirectory`, `IWriteDirectory`, `IFileFactory`, and
- `IDirectoryFactory`, defined in `zope.app.filerepresentation.interfaces`.
+ `IDirectoryFactory`, defined in `zope.filerepresentation.interfaces`.
Modified: Zope3/branches/jim-adapter/src/zope/app/ftp/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/ftp/__init__.py 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/ftp/__init__.py 2006-04-12 21:02:57 UTC (rev 66911)
@@ -26,12 +26,12 @@
from zope.event import notify
from zope.lifecycleevent import ObjectCreatedEvent
from zope.dublincore.interfaces import IZopeDublinCore
+from zope.filerepresentation.interfaces import IReadFile, IWriteFile
+from zope.filerepresentation.interfaces import IReadDirectory
+from zope.filerepresentation.interfaces import IWriteDirectory
+from zope.filerepresentation.interfaces import IFileFactory
+from zope.filerepresentation.interfaces import IDirectoryFactory
-from zope.app.filerepresentation.interfaces import IReadFile, IWriteFile
-from zope.app.filerepresentation.interfaces import IReadDirectory
-from zope.app.filerepresentation.interfaces import IWriteDirectory
-from zope.app.filerepresentation.interfaces import IFileFactory
-from zope.app.filerepresentation.interfaces import IDirectoryFactory
from zope.app.copypastemove.interfaces import IContainerItemRenamer
from zope.app.container.interfaces import IContainer
Modified: Zope3/branches/jim-adapter/src/zope/app/ftp/tests/test_ftpview.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/ftp/tests/test_ftpview.py 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/ftp/tests/test_ftpview.py 2006-04-12 21:02:57 UTC (rev 66911)
@@ -22,13 +22,13 @@
from zope.interface import implements
from zope.security.checker import defineChecker, NamesChecker
from zope.dublincore.interfaces import IZopeDublinCore
+from zope.filerepresentation.interfaces import IReadFile, IWriteFile
+from zope.filerepresentation.interfaces import IReadDirectory
+from zope.filerepresentation.interfaces import IWriteDirectory
+from zope.filerepresentation.interfaces import IFileFactory
+from zope.filerepresentation.interfaces import IDirectoryFactory
from zope.app.testing import ztapi
-from zope.app.filerepresentation.interfaces import IReadFile, IWriteFile
-from zope.app.filerepresentation.interfaces import IReadDirectory
-from zope.app.filerepresentation.interfaces import IWriteDirectory
-from zope.app.filerepresentation.interfaces import IFileFactory
-from zope.app.filerepresentation.interfaces import IDirectoryFactory
from zope.app.ftp import FTPView
from zope.app.testing.placelesssetup import PlacelessSetup
from zope.app.copypastemove.interfaces import IObjectMover
Modified: Zope3/branches/jim-adapter/src/zope/app/http/delete.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/http/delete.py 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/http/delete.py 2006-04-12 21:02:57 UTC (rev 66911)
@@ -15,7 +15,7 @@
"""
__docformat__ = 'restructuredtext'
-from zope.app.filerepresentation.interfaces import IWriteDirectory
+from zope.filerepresentation.interfaces import IWriteDirectory
from zope.app.publication.http import MethodNotAllowed
Modified: Zope3/branches/jim-adapter/src/zope/app/http/put.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/http/put.py 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/http/put.py 2006-04-12 21:02:57 UTC (rev 66911)
@@ -19,10 +19,10 @@
from zope.event import notify
from zope.lifecycleevent import ObjectCreatedEvent
from zope.interface import implements
+from zope.filerepresentation.interfaces import IWriteFile
+from zope.filerepresentation.interfaces import IWriteDirectory, IFileFactory
from zope.app.http.interfaces import INullResource
-from zope.app.filerepresentation.interfaces import IWriteFile
-from zope.app.filerepresentation.interfaces import IWriteDirectory, IFileFactory
class NullResource(object):
"""Object representing objects to be created by a `PUT`.
Modified: Zope3/branches/jim-adapter/src/zope/app/http/tests/test_delete.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/http/tests/test_delete.py 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/http/tests/test_delete.py 2006-04-12 21:02:57 UTC (rev 66911)
@@ -16,15 +16,16 @@
$Id$
"""
from unittest import TestCase, TestSuite, makeSuite
+
+from zope.interface import implements
+from zope.publisher.browser import TestRequest
+from zope.filerepresentation.interfaces import IWriteDirectory, IFileFactory
+
import zope.app.http.delete
-from zope.publisher.browser import TestRequest
-from zope.app.filerepresentation.interfaces import IWriteDirectory, IFileFactory
from zope.app.testing.placelesssetup import PlacelessSetup
-from zope.interface import implements
from zope.app.container.contained import contained
from zope.app.publication.http import MethodNotAllowed
-
class UnwritableContainer(object):
pass
Modified: Zope3/branches/jim-adapter/src/zope/app/http/tests/test_put.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/http/tests/test_put.py 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/http/tests/test_put.py 2006-04-12 21:02:57 UTC (rev 66911)
@@ -17,12 +17,14 @@
"""
from unittest import TestCase, TestSuite, makeSuite
from StringIO import StringIO
+
+from zope.interface import implements
+from zope.publisher.browser import TestRequest
+from zope.filerepresentation.interfaces import IWriteFile
+from zope.filerepresentation.interfaces import IWriteDirectory, IFileFactory
+
import zope.app.http.put
-from zope.publisher.browser import TestRequest
-from zope.app.filerepresentation.interfaces import IWriteFile
-from zope.app.filerepresentation.interfaces import IWriteDirectory, IFileFactory
from zope.app.testing.placelesssetup import PlacelessSetup
-from zope.interface import implements
class File(object):
Modified: Zope3/branches/jim-adapter/src/zope/app/module/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/module/configure.zcml 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/module/configure.zcml 2006-04-12 21:02:57 UTC (rev 66911)
@@ -22,7 +22,7 @@
<adapter
for="zope.app.component.interfaces.ISiteManagementFolder"
- provides="zope.app.filerepresentation.interfaces.IFileFactory"
+ provides="zope.filerepresentation.interfaces.IFileFactory"
name=".py"
factory=".manager.ModuleFactory"
permission="zope.ManageContent"
Modified: Zope3/branches/jim-adapter/src/zope/app/module/manager.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/module/manager.py 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/module/manager.py 2006-04-12 21:02:57 UTC (rev 66911)
@@ -20,8 +20,8 @@
import zodbcode.module
import zope.interface
+from zope.filerepresentation.interfaces import IFileFactory
from zope.app.container.contained import Contained
-from zope.app.filerepresentation.interfaces import IFileFactory
from zope.app.module.interfaces import IModuleManager
from zope.app.module import ZopeModuleRegistry
Modified: Zope3/branches/jim-adapter/src/zope/app/zptpage/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/zptpage/configure.zcml 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/zptpage/configure.zcml 2006-04-12 21:02:57 UTC (rev 66911)
@@ -34,7 +34,7 @@
<adapter
for="zope.app.folder.interfaces.IFolder"
- provides="zope.app.filerepresentation.interfaces.IFileFactory"
+ provides="zope.filerepresentation.interfaces.IFileFactory"
name=".pt"
factory=".zptpage.ZPTFactory"
permission="zope.ManageContent"
@@ -42,14 +42,14 @@
<adapter
for=".interfaces.IZPTPage"
- provides="zope.app.filerepresentation.interfaces.IReadFile"
+ provides="zope.filerepresentation.interfaces.IReadFile"
factory=".zptpage.ZPTReadFile"
permission="zope.ManageContent"
/>
<adapter
for=".interfaces.IZPTPage"
- provides="zope.app.filerepresentation.interfaces.IWriteFile"
+ provides="zope.filerepresentation.interfaces.IWriteFile"
factory=".zptpage.ZPTWriteFile"
permission="zope.ManageContent"
/>
Modified: Zope3/branches/jim-adapter/src/zope/app/zptpage/zptpage.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/zptpage/zptpage.py 2006-04-12 21:01:55 UTC (rev 66910)
+++ Zope3/branches/jim-adapter/src/zope/app/zptpage/zptpage.py 2006-04-12 21:02:57 UTC (rev 66911)
@@ -22,17 +22,16 @@
from zope.pagetemplate.pagetemplate import PageTemplate
from zope.size.interfaces import ISized
from zope.publisher.browser import BrowserView
+from zope.traversing.api import getPath
+from zope.filerepresentation.interfaces import IReadFile, IWriteFile
+from zope.filerepresentation.interfaces import IFileFactory
-from zope.app import zapi
from zope.app.pagetemplate.engine import AppPT
from zope.app.i18n import ZopeMessageFactory as _
-from zope.app.filerepresentation.interfaces import IReadFile, IWriteFile
-from zope.app.filerepresentation.interfaces import IFileFactory
from zope.app.container.contained import Contained
from zope.app.publication.interfaces import IFileContent
+from zope.app.zptpage.interfaces import IZPTPage, IRenderZPTPage
-from interfaces import IZPTPage, IRenderZPTPage
-
class ZPTPage(AppPT, PageTemplate, Persistent, Contained):
implements(IZPTPage, IRenderZPTPage, IFileContent)
@@ -72,7 +71,7 @@
def pt_source_file(self):
try:
- return zapi.getPath(self)
+ return getPath(self)
except TypeError:
return None
More information about the Checkins
mailing list