[Zope3-checkins] SVN: Zope3/branches/jim-adapter/src/ Fix up zwiki
and bugtracker for new location of zope.traversing.
Philipp von Weitershausen
philikon at philikon.de
Wed Apr 5 08:01:02 EDT 2006
Log message for revision 66519:
Fix up zwiki and bugtracker for new location of zope.traversing.
Changed:
U Zope3/branches/jim-adapter/src/bugtracker/tests/placelesssetup.py
U Zope3/branches/jim-adapter/src/bugtracker/tests/test_dependencies.py
U Zope3/branches/jim-adapter/src/bugtracker/tests/test_mail.py
U Zope3/branches/jim-adapter/src/zwiki/browser/wiki.py
U Zope3/branches/jim-adapter/src/zwiki/browser/wikipage.py
U Zope3/branches/jim-adapter/src/zwiki/configure.zcml
U Zope3/branches/jim-adapter/src/zwiki/tests/test_traversable.py
U Zope3/branches/jim-adapter/src/zwiki/tests/test_traverser.py
U Zope3/branches/jim-adapter/src/zwiki/tests/test_wikipagehierarchy.py
U Zope3/branches/jim-adapter/src/zwiki/traversal.py
-=-
Modified: Zope3/branches/jim-adapter/src/bugtracker/tests/placelesssetup.py
===================================================================
--- Zope3/branches/jim-adapter/src/bugtracker/tests/placelesssetup.py 2006-04-05 11:59:36 UTC (rev 66518)
+++ Zope3/branches/jim-adapter/src/bugtracker/tests/placelesssetup.py 2006-04-05 12:01:01 UTC (rev 66519)
@@ -26,8 +26,11 @@
from zope.schema.vocabulary import getVocabularyRegistry
from zope.size.interfaces import ISized
from zope.size import DefaultSized
+from zope.traversing.interfaces import IContainmentRoot, ITraverser
+from zope.traversing.interfaces import ITraversable, IPhysicallyLocatable
+from zope.traversing.interfaces import IPhysicallyLocatable
+from zope.traversing.adapters import DefaultTraversable, Traverser
-from zope.app import zapi
from zope.app.testing import ztapi
from zope.app.testing.placelesssetup import PlacelessSetup as SetupBase
from zope.app.annotation.attribute import AttributeAnnotations
@@ -43,11 +46,7 @@
from zope.app.renderer.plaintext import PlainTextToHTMLRenderer
from zope.app.renderer.plaintext import PlainTextSourceFactory
from zope.app.security.interfaces import IAuthentication
-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.traversing.adapters import DefaultTraversable, Traverser
-from zope.app.traversing.interfaces import IPhysicallyLocatable
from bugtracker.bug import Bug, BugDependencyAdapter
from bugtracker.comment import Comment
Modified: Zope3/branches/jim-adapter/src/bugtracker/tests/test_dependencies.py
===================================================================
--- Zope3/branches/jim-adapter/src/bugtracker/tests/test_dependencies.py 2006-04-05 11:59:36 UTC (rev 66518)
+++ Zope3/branches/jim-adapter/src/bugtracker/tests/test_dependencies.py 2006-04-05 12:01:01 UTC (rev 66519)
@@ -19,13 +19,13 @@
from zope.interface import classImplements
from zope.component.testing import PlacelessSetup
+from zope.traversing.interfaces import IPhysicallyLocatable
from zope.app.testing import ztapi
from zope.app.annotation.interfaces import IAnnotations, IAttributeAnnotatable
from zope.app.annotation.attribute import AttributeAnnotations
from zope.app.location.interfaces import ILocation
from zope.app.location.traversing import LocationPhysicallyLocatable
-from zope.app.traversing.interfaces import IPhysicallyLocatable
from bugtracker.interfaces import IBug, IBugDependencies
from bugtracker.bug import Bug, BugDependencyAdapter
Modified: Zope3/branches/jim-adapter/src/bugtracker/tests/test_mail.py
===================================================================
--- Zope3/branches/jim-adapter/src/bugtracker/tests/test_mail.py 2006-04-05 11:59:36 UTC (rev 66518)
+++ Zope3/branches/jim-adapter/src/bugtracker/tests/test_mail.py 2006-04-05 12:01:01 UTC (rev 66519)
@@ -19,11 +19,11 @@
from zope.component.testing import PlacelessSetup
from zope.interface import classImplements, implements
+from zope.traversing.interfaces import IPhysicallyLocatable
from zope.app.testing import ztapi
from zope.app.annotation.interfaces import IAnnotations, IAttributeAnnotatable
from zope.app.dublincore.interfaces import IWriteZopeDublinCore
-from zope.app.traversing.interfaces import IPhysicallyLocatable
from zope.app.annotation.attribute import AttributeAnnotations
from zope.app.dublincore.annotatableadapter import ZDCAnnotatableAdapter
Modified: Zope3/branches/jim-adapter/src/zwiki/browser/wiki.py
===================================================================
--- Zope3/branches/jim-adapter/src/zwiki/browser/wiki.py 2006-04-05 11:59:36 UTC (rev 66518)
+++ Zope3/branches/jim-adapter/src/zwiki/browser/wiki.py 2006-04-05 12:01:01 UTC (rev 66519)
@@ -16,11 +16,11 @@
$Id$
"""
from datetime import datetime
+
+import zope.component
from zope.proxy import removeAllProxies
-
-from zope.app import zapi
+from zope.traversing.api import getName, getPath
from zope.app.dublincore.interfaces import ICMFDublinCore
-from zope.app.traversing.api import getName, getPath
from zope.app.container.browser.adding import Adding
from zwiki.interfaces import IWikiPageHierarchy
@@ -33,7 +33,7 @@
if self.request.get('frontpage'):
page = removeAllProxies(
- zapi.createObject('zwiki.WikiPage'))
+ zope.component.createObject('zwiki.WikiPage'))
page.type = u'zope.source.rest'
page.source = u'This is the FrontPage of the Wiki.'
dc = ICMFDublinCore(page)
Modified: Zope3/branches/jim-adapter/src/zwiki/browser/wikipage.py
===================================================================
--- Zope3/branches/jim-adapter/src/zwiki/browser/wikipage.py 2006-04-05 11:59:36 UTC (rev 66518)
+++ Zope3/branches/jim-adapter/src/zwiki/browser/wikipage.py 2006-04-05 12:01:01 UTC (rev 66519)
@@ -18,13 +18,13 @@
import re
from urllib import quote
+from zope.component import createObject, getMultiAdapter
from zope.proxy import removeAllProxies
-from zope.app.publisher.browser import BrowserView
+from zope.traversing.api import getParent, getName
-from zope.app import zapi
from zope.app.form.browser.submit import Update
from zope.app.dublincore.interfaces import ICMFDublinCore
-from zope.app.traversing.api import getParent, getName
+from zope.app.publisher.browser import BrowserView
from zwiki.interfaces import IWikiPageHierarchy, IMailSubscriptions
@@ -125,8 +125,8 @@
def render(self):
"""Render the wiki page source."""
- source = zapi.createObject(self.context.type, self.context.source)
- view = zapi.getMultiAdapter((removeAllProxies(source), self.request))
+ source = createObject(self.context.type, self.context.source)
+ view = getMultiAdapter((removeAllProxies(source), self.request))
html = view.render()
html = self.renderWikiLinks(html)
return html
@@ -135,8 +135,8 @@
result = []
for name, comment in self.context.items():
dc = DublinCoreViews(comment, self.request)
- source = zapi.createObject(comment.type, comment.source)
- view = zapi.getMultiAdapter(
+ source = createObject(comment.type, comment.source)
+ view = getMultiAdapter(
(removeAllProxies(source), self.request))
result.append({
'name': name,
Modified: Zope3/branches/jim-adapter/src/zwiki/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zwiki/configure.zcml 2006-04-05 11:59:36 UTC (rev 66518)
+++ Zope3/branches/jim-adapter/src/zwiki/configure.zcml 2006-04-05 12:01:01 UTC (rev 66519)
@@ -229,7 +229,7 @@
<adapter
factory=".traversal.WikiPageTraversable"
- provides="zope.app.traversing.interfaces.ITraversable"
+ provides="zope.traversing.interfaces.ITraversable"
for=".interfaces.IWikiPage"
trusted="true"
/>
Modified: Zope3/branches/jim-adapter/src/zwiki/tests/test_traversable.py
===================================================================
--- Zope3/branches/jim-adapter/src/zwiki/tests/test_traversable.py 2006-04-05 11:59:36 UTC (rev 66518)
+++ Zope3/branches/jim-adapter/src/zwiki/tests/test_traversable.py 2006-04-05 12:01:01 UTC (rev 66519)
@@ -16,7 +16,7 @@
$Id$
"""
import unittest, sys
-from zope.app.traversing.interfaces import TraversalError
+from zope.traversing.interfaces import TraversalError
from zope.testing.cleanup import CleanUp
from zwiki.wiki import Wiki
Modified: Zope3/branches/jim-adapter/src/zwiki/tests/test_traverser.py
===================================================================
--- Zope3/branches/jim-adapter/src/zwiki/tests/test_traverser.py 2006-04-05 11:59:36 UTC (rev 66518)
+++ Zope3/branches/jim-adapter/src/zwiki/tests/test_traverser.py 2006-04-05 12:01:01 UTC (rev 66519)
@@ -20,15 +20,14 @@
from zope.interface import Interface, classImplements, directlyProvides
from zope.publisher.interfaces import NotFound
from zope.proxy import removeAllProxies
+from zope.traversing.interfaces import IPhysicallyLocatable
-from zope.app import zapi
from zope.app.annotation.attribute import AttributeAnnotations
from zope.app.annotation.interfaces import IAnnotations, IAttributeAnnotatable
from zope.app.location.interfaces import ILocation
from zope.app.location.traversing import LocationPhysicallyLocatable
from zope.app.testing import ztapi
from zope.app.testing.placelesssetup import PlacelessSetup
-from zope.app.traversing.interfaces import IPhysicallyLocatable
from zwiki.interfaces import IWikiPage, IWikiPageHierarchy
from zwiki.wiki import Wiki
Modified: Zope3/branches/jim-adapter/src/zwiki/tests/test_wikipagehierarchy.py
===================================================================
--- Zope3/branches/jim-adapter/src/zwiki/tests/test_wikipagehierarchy.py 2006-04-05 11:59:36 UTC (rev 66518)
+++ Zope3/branches/jim-adapter/src/zwiki/tests/test_wikipagehierarchy.py 2006-04-05 12:01:01 UTC (rev 66519)
@@ -18,15 +18,14 @@
import unittest
from zope.interface import implements, classImplements
-from zope.app.testing import ztapi
+from zope.traversing.interfaces import IPhysicallyLocatable
+from zope.app.testing import ztapi
from zope.app.annotation.interfaces import IAnnotations, IAttributeAnnotatable
-from zope.app.traversing.interfaces import IPhysicallyLocatable
-from zope.app.location.interfaces import ILocation
-
-from zope.app.site.tests.placefulsetup import PlacefulSetup
from zope.app.annotation.attribute import AttributeAnnotations
+from zope.app.location.interfaces import ILocation
from zope.app.location.traversing import LocationPhysicallyLocatable
+from zope.app.site.tests.placefulsetup import PlacefulSetup
from zwiki.interfaces import IWikiPage, IWikiPageHierarchy
from zwiki.wikipage import WikiPage, WikiPageHierarchyAdapter
Modified: Zope3/branches/jim-adapter/src/zwiki/traversal.py
===================================================================
--- Zope3/branches/jim-adapter/src/zwiki/traversal.py 2006-04-05 11:59:36 UTC (rev 66518)
+++ Zope3/branches/jim-adapter/src/zwiki/traversal.py 2006-04-05 12:01:01 UTC (rev 66519)
@@ -15,14 +15,12 @@
"""
from zope.interface import implements
from zope.proxy import removeAllProxies
-from zope.publisher.interfaces import IPublishTraverse
-from zope.publisher.interfaces import NotFound
-from zope.app.traversing.interfaces import TraversalError
+from zope.publisher.interfaces import IPublishTraverse, NotFound
+from zope.traversing.interfaces import TraversalError, ITraversable
+from zope.traversing.api import getParent
+from zope.traversing.namespace import UnexpectedParameters
from zope.app import zapi
-from zope.app.traversing.api import getParent
-from zope.app.traversing.namespace import UnexpectedParameters
-from zope.app.traversing.interfaces import ITraversable
from zwiki.interfaces import IWikiPage, IWikiPageHierarchy
More information about the Zope3-Checkins
mailing list