[Zope3-checkins] SVN: Zope3/branches/jim-adapter/src/zope/app/ Fix
up zope.app after moving zope.app.dublincore to zope.dublincore.
Philipp von Weitershausen
philikon at philikon.de
Wed Apr 12 16:18:29 EDT 2006
Log message for revision 66904:
Fix up zope.app after moving zope.app.dublincore to zope.dublincore.
Changed:
U Zope3/branches/jim-adapter/src/zope/app/authentication/vocabulary.py
U Zope3/branches/jim-adapter/src/zope/app/authentication/vocabulary.txt
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/browser/ftests/test_contents.py
U Zope3/branches/jim-adapter/src/zope/app/container/browser/tests/test_contents.py
U Zope3/branches/jim-adapter/src/zope/app/container/ftests/test_view_permissions.py
U Zope3/branches/jim-adapter/src/zope/app/dav/adapter.py
U Zope3/branches/jim-adapter/src/zope/app/dav/configure.zcml
U Zope3/branches/jim-adapter/src/zope/app/dav/ftests/test_propfind.py
U Zope3/branches/jim-adapter/src/zope/app/dav/ftests/test_proppatch.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/dav/tests/test_proppatch.py
U Zope3/branches/jim-adapter/src/zope/app/demo/menu/menu.py
U Zope3/branches/jim-adapter/src/zope/app/folder/tests.py
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/pagetemplate/talesapi.py
U Zope3/branches/jim-adapter/src/zope/app/pagetemplate/tests/test_talesapi.py
U Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/browser/instance.py
U Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/tests/test_xmlimportexport.py
U Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/xmlimportexport.py
-=-
Modified: Zope3/branches/jim-adapter/src/zope/app/authentication/vocabulary.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/authentication/vocabulary.py 2006-04-12 20:17:53 UTC (rev 66903)
+++ Zope3/branches/jim-adapter/src/zope/app/authentication/vocabulary.py 2006-04-12 20:18:27 UTC (rev 66904)
@@ -19,12 +19,12 @@
"""
__docformat__ = "reStructuredText"
+import zope.dublincore.interfaces
from zope import interface, component, i18n
from zope.interface.interfaces import IInterface
from zope.schema import vocabulary
from zope.schema.interfaces import IVocabularyFactory
-import zope.app.dublincore.interfaces
from zope.app.component.interfaces import ILocalUtility
from zope.app.i18n import ZopeMessageFactory as _
@@ -62,7 +62,7 @@
if isPAU:
for k, v in context.items():
if interface.providedBy(v) and not ILocalUtility.providedBy(v):
- dc = zope.app.dublincore.interfaces.IDCDescriptiveProperties(
+ dc = zope.dublincore.interfaces.IDCDescriptiveProperties(
v, None)
if dc is not None and dc.title:
title = dc.title
Modified: Zope3/branches/jim-adapter/src/zope/app/authentication/vocabulary.txt
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/authentication/vocabulary.txt 2006-04-12 20:17:53 UTC (rev 66903)
+++ Zope3/branches/jim-adapter/src/zope/app/authentication/vocabulary.txt 2006-04-12 20:18:27 UTC (rev 66904)
@@ -104,14 +104,14 @@
We'll give one of the plugins a dublin core title just to show the
functionality.
- >>> import zope.app.dublincore.interfaces
+ >>> import zope.dublincore.interfaces
>>> class ISpecial(interface.Interface):
... pass
...
>>> interface.directlyProvides(contained_plugins[1], ISpecial)
>>> class DemoDCAdapter(object):
... interface.implements(
- ... zope.app.dublincore.interfaces.IDCDescriptiveProperties)
+ ... zope.dublincore.interfaces.IDCDescriptiveProperties)
... component.adapts(ISpecial)
... def __init__(self, context):
... pass
Modified: Zope3/branches/jim-adapter/src/zope/app/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/configure.zcml 2006-04-12 20:17:53 UTC (rev 66903)
+++ Zope3/branches/jim-adapter/src/zope/app/configure.zcml 2006-04-12 20:18:27 UTC (rev 66904)
@@ -69,7 +69,7 @@
<!-- Additional packages -->
<include package="zope.app.applicationcontrol" />
- <include package="zope.app.dublincore" />
+ <include package="zope.dublincore" />
<include package="zope.app.introspector" />
<include package="zope.app.wsgi" />
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-12 20:17:53 UTC (rev 66903)
+++ Zope3/branches/jim-adapter/src/zope/app/container/browser/contents.py 2006-04-12 20:18:27 UTC (rev 66904)
@@ -25,12 +25,12 @@
from zope.size.interfaces import ISized
from zope.traversing.interfaces import TraversalError
from zope.publisher.browser import BrowserView
+from zope.dublincore.interfaces import IZopeDublinCore
+from zope.dublincore.interfaces import IDCDescriptiveProperties
from zope.app import zapi
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
from zope.app.i18n import ZopeMessageFactory as _
-from zope.app.dublincore.interfaces import IZopeDublinCore
-from zope.app.dublincore.interfaces import IDCDescriptiveProperties
from zope.app.copypastemove.interfaces import IPrincipalClipboard
from zope.app.copypastemove.interfaces import IObjectCopier, IObjectMover
from zope.app.copypastemove.interfaces import IContainerItemRenamer
Modified: Zope3/branches/jim-adapter/src/zope/app/container/browser/ftests/test_contents.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/container/browser/ftests/test_contents.py 2006-04-12 20:17:53 UTC (rev 66903)
+++ Zope3/branches/jim-adapter/src/zope/app/container/browser/ftests/test_contents.py 2006-04-12 20:18:27 UTC (rev 66904)
@@ -22,10 +22,10 @@
import transaction
from zope.interface import implements, Interface
from zope.annotation.interfaces import IAttributeAnnotatable
+from zope.dublincore.interfaces import IZopeDublinCore
from zope.app import copypastemove
from zope.app.container.interfaces import IReadContainer, IContained
-from zope.app.dublincore.interfaces import IZopeDublinCore
from zope.app.testing import ztapi
from zope.app.testing.functional import BrowserTestCase
from zope.app.testing.functional import FunctionalDocFileSuite
Modified: Zope3/branches/jim-adapter/src/zope/app/container/browser/tests/test_contents.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/container/browser/tests/test_contents.py 2006-04-12 20:17:53 UTC (rev 66903)
+++ Zope3/branches/jim-adapter/src/zope/app/container/browser/tests/test_contents.py 2006-04-12 20:18:27 UTC (rev 66904)
@@ -102,7 +102,7 @@
container['document'] = document
from datetime import datetime
- from zope.app.dublincore.interfaces import IZopeDublinCore
+ from zope.dublincore.interfaces import IZopeDublinCore
class FauxDCAdapter(object):
implements(IZopeDublinCore)
Modified: Zope3/branches/jim-adapter/src/zope/app/container/ftests/test_view_permissions.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/container/ftests/test_view_permissions.py 2006-04-12 20:17:53 UTC (rev 66903)
+++ Zope3/branches/jim-adapter/src/zope/app/container/ftests/test_view_permissions.py 2006-04-12 20:18:27 UTC (rev 66904)
@@ -22,7 +22,7 @@
from zope.app.testing.functional import BrowserTestCase
from zope.app.file import File
-from zope.app.dublincore.interfaces import IZopeDublinCore
+from zope.dublincore.interfaces import IZopeDublinCore
from zope.app.securitypolicy.interfaces import IRolePermissionManager
@@ -32,7 +32,7 @@
"""Tests the default view permissions.
See zope/app/securitypolicy/configure.zcml for the grants of
- zope.View and zope.app.dublincore.view to zope.Anonymous. These
+ zope.View and zope.dublincore.view to zope.Anonymous. These
ensure that, by default, anonymous users can view container contents.
"""
# add an item that can be viewed from the root folder
@@ -77,7 +77,7 @@
self.getRootFolder()['file'] = file
IZopeDublinCore(file).title = u'My File'
- # deny zope.app.dublincore.view to zope.Anonymous
+ # deny zope.dublincore.view to zope.Anonymous
prm = IRolePermissionManager(self.getRootFolder())
prm.denyPermissionToRole('zope.app.dublincore.view', 'zope.Anonymous')
transaction.commit()
Modified: Zope3/branches/jim-adapter/src/zope/app/dav/adapter.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/adapter.py 2006-04-12 20:17:53 UTC (rev 66903)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/adapter.py 2006-04-12 20:18:27 UTC (rev 66904)
@@ -22,10 +22,10 @@
from zope.interface import implements
from zope.i18n import translate
from zope.size.interfaces import ISized
+from zope.dublincore.interfaces import IDCTimes
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.file.interfaces import IFile
Modified: Zope3/branches/jim-adapter/src/zope/app/dav/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/configure.zcml 2006-04-12 20:17:53 UTC (rev 66903)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/configure.zcml 2006-04-12 20:18:27 UTC (rev 66904)
@@ -134,7 +134,7 @@
<dav:provideInterface
for="http://purl.org/dc/1.1"
- interface="zope.app.dublincore.interfaces.IZopeDublinCore" />
+ interface="zope.dublincore.interfaces.IZopeDublinCore" />
<dav:provideInterface
for="DAV:"
Modified: Zope3/branches/jim-adapter/src/zope/app/dav/ftests/test_propfind.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/ftests/test_propfind.py 2006-04-12 20:17:53 UTC (rev 66903)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/ftests/test_propfind.py 2006-04-12 20:18:27 UTC (rev 66904)
@@ -20,8 +20,8 @@
from datetime import datetime
from zope.pagetemplate.tests.util import normalize_xml
from zope.traversing.api import traverse
+from zope.dublincore.interfaces import IZopeDublinCore
-from zope.app.dublincore.interfaces import IZopeDublinCore
from zope.app.dav.ftests.dav import DAVTestCase
from zope.app.dav.opaquenamespaces import IDAVOpaqueNamespaces
Modified: Zope3/branches/jim-adapter/src/zope/app/dav/ftests/test_proppatch.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/ftests/test_proppatch.py 2006-04-12 20:17:53 UTC (rev 66903)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/ftests/test_proppatch.py 2006-04-12 20:18:27 UTC (rev 66904)
@@ -20,8 +20,8 @@
from zope.pagetemplate.tests.util import normalize_xml
from zope.publisher.http import status_reasons
from zope.traversing.api import traverse
+from zope.dublincore.interfaces import IZopeDublinCore
-from zope.app.dublincore.interfaces import IZopeDublinCore
from zope.app.dav.ftests.dav import DAVTestCase
from zope.app.dav.opaquenamespaces import IDAVOpaqueNamespaces
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 20:17:53 UTC (rev 66903)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_adapter.py 2006-04-12 20:18:27 UTC (rev 66904)
@@ -27,13 +27,13 @@
from zope.annotation.interfaces import IAnnotatable, IAttributeAnnotatable
from zope.annotation.interfaces import IAnnotations
from zope.annotation.attribute import AttributeAnnotations
+from zope.dublincore.interfaces import IWriteZopeDublinCore
+from zope.dublincore.annotatableadapter import ZDCAnnotatableAdapter
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 _
-from zope.app.dublincore.interfaces import IWriteZopeDublinCore
-from zope.app.dublincore.annotatableadapter import ZDCAnnotatableAdapter
class IRobot(Interface):
pass
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-12 20:17:53 UTC (rev 66903)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_propfind.py 2006-04-12 20:18:27 UTC (rev 66904)
@@ -32,13 +32,13 @@
from zope.publisher.browser import TestRequest
from zope.annotation.interfaces import IAnnotatable, IAnnotations
from zope.annotation.attribute import AttributeAnnotations
+from zope.dublincore.interfaces import IZopeDublinCore
+from zope.dublincore.annotatableadapter import ZDCAnnotatableAdapter
from zope.app import zapi
from zope.app.testing import ztapi
from zope.app.container.interfaces import IReadContainer
from zope.app.component.testing import PlacefulSetup
-from zope.app.dublincore.interfaces import IZopeDublinCore
-from zope.app.dublincore.annotatableadapter import ZDCAnnotatableAdapter
from zope.app.file.interfaces import IFile
from zope.app.dav import propfind
Modified: Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_proppatch.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_proppatch.py 2006-04-12 20:17:53 UTC (rev 66903)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_proppatch.py 2006-04-12 20:18:27 UTC (rev 66904)
@@ -34,14 +34,13 @@
from zope.traversing.browser import AbsoluteURL
from zope.annotation.interfaces import IAnnotatable, IAnnotations
from zope.annotation.attribute import AttributeAnnotations
+from zope.dublincore.interfaces import IZopeDublinCore
+from zope.dublincore.annotatableadapter import ZDCAnnotatableAdapter
+from zope.dublincore.zopedublincore import ScalarProperty
from zope.app import zapi
from zope.app.testing import ztapi
-
from zope.app.component.testing import PlacefulSetup
-from zope.app.dublincore.interfaces import IZopeDublinCore
-from zope.app.dublincore.annotatableadapter import ZDCAnnotatableAdapter
-from zope.app.dublincore.zopedublincore import ScalarProperty
import zope.app.dav.tests
from zope.app.dav.tests.unitfixtures import File, Folder, FooZPT
Modified: Zope3/branches/jim-adapter/src/zope/app/demo/menu/menu.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/demo/menu/menu.py 2006-04-12 20:17:53 UTC (rev 66903)
+++ Zope3/branches/jim-adapter/src/zope/app/demo/menu/menu.py 2006-04-12 20:18:27 UTC (rev 66904)
@@ -20,7 +20,7 @@
from zope.app import zapi
from zope.app.component.hooks import getSite
-from zope.app.dublincore.interfaces import IZopeDublinCore
+from zope.dublincore.interfaces import IZopeDublinCore
from zope.app.publisher.interfaces.browser import IBrowserMenu
Modified: Zope3/branches/jim-adapter/src/zope/app/folder/tests.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/folder/tests.py 2006-04-12 20:17:53 UTC (rev 66903)
+++ Zope3/branches/jim-adapter/src/zope/app/folder/tests.py 2006-04-12 20:18:27 UTC (rev 66904)
@@ -18,12 +18,12 @@
from unittest import TestCase, TestSuite, main, makeSuite
+import zope.component
from zope.testing.doctestunit import DocTestSuite
+from zope.dublincore.interfaces import IZopeDublinCore
+from zope.dublincore.annotatableadapter import ZDCAnnotatableAdapter
-from zope.app.testing import ztapi
-from zope.app.dublincore.interfaces import IZopeDublinCore
from zope.app.folder.interfaces import IFolder
-from zope.app.dublincore.annotatableadapter import ZDCAnnotatableAdapter
from zope.app.component.testing import PlacefulSetup
from zope.app.component.tests.test_site import BaseTestSiteManagerContainer
from zope.app.container.tests.test_icontainer import BaseTestIContainer
@@ -51,7 +51,8 @@
def setUp(self):
PlacefulSetup.setUp(self)
PlacefulSetup.buildFolders(self)
- ztapi.provideAdapter(IFolder, IZopeDublinCore, ZDCAnnotatableAdapter)
+ zope.component.provideAdapter(ZDCAnnotatableAdapter, (IFolder,),
+ IZopeDublinCore)
def test_suite():
from zope.testing.doctestunit import DocTestSuite
Modified: Zope3/branches/jim-adapter/src/zope/app/ftp/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/ftp/__init__.py 2006-04-12 20:17:53 UTC (rev 66903)
+++ Zope3/branches/jim-adapter/src/zope/app/ftp/__init__.py 2006-04-12 20:18:27 UTC (rev 66904)
@@ -25,13 +25,13 @@
from zope.security.checker import canAccess
from zope.event import notify
from zope.lifecycleevent import ObjectCreatedEvent
+from zope.dublincore.interfaces import IZopeDublinCore
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.dublincore.interfaces import IZopeDublinCore
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 20:17:53 UTC (rev 66903)
+++ Zope3/branches/jim-adapter/src/zope/app/ftp/tests/test_ftpview.py 2006-04-12 20:18:27 UTC (rev 66904)
@@ -21,6 +21,7 @@
from zope.interface import implements
from zope.security.checker import defineChecker, NamesChecker
+from zope.dublincore.interfaces import IZopeDublinCore
from zope.app.testing import ztapi
from zope.app.filerepresentation.interfaces import IReadFile, IWriteFile
@@ -28,7 +29,6 @@
from zope.app.filerepresentation.interfaces import IWriteDirectory
from zope.app.filerepresentation.interfaces import IFileFactory
from zope.app.filerepresentation.interfaces import IDirectoryFactory
-from zope.app.dublincore.interfaces import IZopeDublinCore
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/pagetemplate/talesapi.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/pagetemplate/talesapi.py 2006-04-12 20:17:53 UTC (rev 66903)
+++ Zope3/branches/jim-adapter/src/zope/app/pagetemplate/talesapi.py 2006-04-12 20:18:27 UTC (rev 66904)
@@ -21,13 +21,11 @@
from zope.size.interfaces import ISized
from zope.security.interfaces import Unauthorized
from zope.tales.interfaces import ITALESFunctionNamespace
+from zope.dublincore.interfaces import IDCDescriptiveProperties
+from zope.dublincore.interfaces import IDCTimes
+from zope.dublincore.interfaces import IZopeDublinCore
+from zope.traversing.api import getName
-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)
@@ -67,13 +65,13 @@
modified = property(modified)
def name(self):
- return zapi.name(self.context)
+ return getName(self.context)
def title_or_name(self):
try:
- return getattr(self, 'title', '') or zapi.name(self.context)
+ return getattr(self, 'title', '') or getName(self.context)
except Unauthorized:
- return zapi.name(self.context)
+ return getName(self.context)
def size(self):
a = ISized(self.context, None)
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-12 20:17:53 UTC (rev 66903)
+++ Zope3/branches/jim-adapter/src/zope/app/pagetemplate/tests/test_talesapi.py 2006-04-12 20:18:27 UTC (rev 66904)
@@ -20,8 +20,8 @@
from zope.interface import implements
from zope.size.interfaces import ISized
from zope.traversing.interfaces import IPhysicallyLocatable
+from zope.dublincore.interfaces import IZopeDublinCore
-from zope.app.dublincore.interfaces import IZopeDublinCore
from zope.app.pagetemplate.talesapi import ZopeTalesAPI
class TestObject(object):
Modified: Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/browser/instance.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/browser/instance.py 2006-04-12 20:17:53 UTC (rev 66903)
+++ Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/browser/instance.py 2006-04-12 20:18:27 UTC (rev 66904)
@@ -20,13 +20,12 @@
from zope.security.proxy import removeSecurityProxy
from zope.schema import getFields
from zope.publisher.browser import BrowserView
+from zope.dublincore.interfaces import IZopeDublinCore
-from zope.app import zapi
from zope.app.form.browser.submit import Update
from zope.app.form.utility import setUpWidget, applyWidgetsChanges
from zope.app.form.interfaces import IInputWidget
from zope.app.i18n import ZopeMessageFactory as _
-from zope.app.dublincore.interfaces import IZopeDublinCore
from zope.app.workflow.interfaces import IProcessDefinition
from zope.app.workflow.interfaces import IProcessInstanceContainer
Modified: Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/tests/test_xmlimportexport.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/tests/test_xmlimportexport.py 2006-04-12 20:17:53 UTC (rev 66903)
+++ Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/tests/test_xmlimportexport.py 2006-04-12 20:18:27 UTC (rev 66904)
@@ -22,9 +22,9 @@
from zope.annotation.attribute import AttributeAnnotations
from zope.annotation.interfaces import IAnnotatable, IAnnotations
from zope.annotation.interfaces import IAttributeAnnotatable
+from zope.dublincore.annotatableadapter import ZDCAnnotatableAdapter
+from zope.dublincore.interfaces import IZopeDublinCore
-from zope.app.dublincore.annotatableadapter import ZDCAnnotatableAdapter
-from zope.app.dublincore.interfaces import IZopeDublinCore
from zope.app.security.interfaces import IPermission
from zope.app.workflow.interfaces import IProcessDefinitionExportHandler
from zope.app.workflow.interfaces import IProcessDefinitionImportHandler
Modified: Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/xmlimportexport.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/xmlimportexport.py 2006-04-12 20:17:53 UTC (rev 66903)
+++ Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/xmlimportexport.py 2006-04-12 20:18:27 UTC (rev 66904)
@@ -18,14 +18,14 @@
from xml.sax import parseString
from xml.sax.handler import ContentHandler
+import zope.component
from zope.configuration.name import resolve
from zope.interface import implements
from zope.proxy import removeAllProxies
from zope.security.checker import CheckerPublic
from zope.security.proxy import removeSecurityProxy
+from zope.dublincore.interfaces import IZopeDublinCore
-from zope.app import zapi
-from zope.app.dublincore.interfaces import IZopeDublinCore
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
from zope.app.security.interfaces import IPermission
from zope.app.workflow.interfaces import IProcessDefinitionImportHandler
@@ -95,7 +95,7 @@
elif perm_id == '':
perm = None
else:
- perm = zapi.getUtility(IPermission, perm_id)
+ perm = zope.component.getUtility(IPermission, perm_id)
if not fieldName in perms.keys():
perms[fieldName] = (CheckerPublic, CheckerPublic)
if type == u'get':
More information about the Zope3-Checkins
mailing list