[Zope3-checkins] SVN: Zope3/trunk/src/ Move wiki to src.
Stephan Richter
srichter at cosmos.phy.tufts.edu
Tue Jul 13 13:08:10 EDT 2004
Log message for revision 26483:
Move wiki to src.
Changed:
A Zope3/trunk/src/wiki/
U Zope3/trunk/src/wiki/CHANGES.txt
U Zope3/trunk/src/wiki/INSTALL.txt
U Zope3/trunk/src/wiki/VERSION.txt
U Zope3/trunk/src/wiki/browser/configure.zcml
U Zope3/trunk/src/wiki/browser/wiki.py
U Zope3/trunk/src/wiki/browser/wikipage.py
U Zope3/trunk/src/wiki/comment.py
U Zope3/trunk/src/wiki/configure.zcml
U Zope3/trunk/src/wiki/tests/test_docstrings.py
U Zope3/trunk/src/wiki/tests/test_traversable.py
U Zope3/trunk/src/wiki/tests/test_traverser.py
U Zope3/trunk/src/wiki/tests/test_wiki.py
U Zope3/trunk/src/wiki/tests/test_wikimail.py
U Zope3/trunk/src/wiki/tests/test_wikipage.py
U Zope3/trunk/src/wiki/tests/test_wikipagehierarchy.py
U Zope3/trunk/src/wiki/traversal.py
U Zope3/trunk/src/wiki/wiki.py
U Zope3/trunk/src/wiki/wikipage.py
D Zope3/trunk/src/zope/app/wiki/
-=-
Copied: Zope3/trunk/src/wiki (from rev 26391, Zope3/trunk/src/zope/app/wiki)
Modified: Zope3/trunk/src/wiki/CHANGES.txt
===================================================================
--- Zope3/trunk/src/zope/app/wiki/CHANGES.txt 2004-07-10 12:47:23 UTC (rev 26391)
+++ Zope3/trunk/src/wiki/CHANGES.txt 2004-07-13 17:08:10 UTC (rev 26483)
@@ -1,6 +1,10 @@
CHANGES
+ Version 0.2
+
+ - Moved from zope.app.wiki to wiki.
+
Version 0.1.0
- Since Indices and ObjectHub are not part of Zope X3.0, I removed the
Modified: Zope3/trunk/src/wiki/INSTALL.txt
===================================================================
--- Zope3/trunk/src/zope/app/wiki/INSTALL.txt 2004-07-10 12:47:23 UTC (rev 26391)
+++ Zope3/trunk/src/wiki/INSTALL.txt 2004-07-13 17:08:10 UTC (rev 26483)
@@ -4,7 +4,7 @@
- Since Wiki is not enabled by default, you need to include the Wiki
package in your products.zcml file::
- <include package="zope.app.wiki" />
+ <include package="zwiki" />
- You need to define the following role declarations to your user in order
to use the wiki package effectively::
Modified: Zope3/trunk/src/wiki/VERSION.txt
===================================================================
--- Zope3/trunk/src/zope/app/wiki/VERSION.txt 2004-07-10 12:47:23 UTC (rev 26391)
+++ Zope3/trunk/src/wiki/VERSION.txt 2004-07-13 17:08:10 UTC (rev 26483)
@@ -1 +1 @@
-Zope3 Wiki 0.1.0
\ No newline at end of file
+Zope3 Wiki 0.2.0
\ No newline at end of file
Modified: Zope3/trunk/src/wiki/browser/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/wiki/browser/configure.zcml 2004-07-10 12:47:23 UTC (rev 26391)
+++ Zope3/trunk/src/wiki/browser/configure.zcml 2004-07-13 17:08:10 UTC (rev 26483)
@@ -8,14 +8,14 @@
<browser:addform
label="Add Wiki"
name="AddWiki.html"
- schema="zope.app.wiki.interfaces.IWiki"
- content_factory="zope.app.wiki.wiki.Wiki"
- permission="zope.app.wiki.AddWikiPage"
+ schema="zwiki.interfaces.IWiki"
+ content_factory="zwiki.wiki.Wiki"
+ permission="zwiki.AddWikiPage"
class=".wiki.AddWiki"
template="wiki_add.pt" />
<browser:addMenuItem
- class="zope.app.wiki.wiki.Wiki"
+ class="zwiki.wiki.Wiki"
title="Wiki"
description="A Wiki"
permission="zope.ManageContent"
@@ -23,24 +23,24 @@
<browser:page
name="toc.html"
- for="zope.app.wiki.interfaces.IWiki"
+ for="zwiki.interfaces.IWiki"
class=".wiki.TableOfContents"
template="wiki_toc.pt"
- permission="zope.app.wiki.ViewWikiPage"
+ permission="zwiki.ViewWikiPage"
menu="zmi_views" title="TOC" />
<browser:page
name="search.html"
- for="zope.app.wiki.interfaces.IWiki"
+ for="zwiki.interfaces.IWiki"
class=".wiki.WikiSearch"
template="wiki_search.pt"
- permission="zope.app.wiki.ViewWikiPage"
+ permission="zwiki.ViewWikiPage"
menu="zmi_views" title="Search" />
<browser:pages
- for="zope.app.wiki.interfaces.IWiki"
+ for="zwiki.interfaces.IWiki"
class=".wikipage.MailSubscriptions"
- permission="zope.app.wiki.EditWikiPage">
+ permission="zwiki.EditWikiPage">
<browser:page name="subscriptions.html" template="subscriptions.pt"
menu="zmi_views" title="Subscriptions" />
<browser:page name="changeSubscriptions.html" attribute="change" />
@@ -48,11 +48,11 @@
<browser:defaultView
name="toc.html"
- for="zope.app.wiki.interfaces.IWiki" />
+ for="zwiki.interfaces.IWiki" />
<browser:icon
name="zmi_icon"
- for="zope.app.wiki.interfaces.IWiki"
+ for="zwiki.interfaces.IWiki"
file="wiki_icon.gif" />
<!-- WikiPage browser configuration -->
@@ -60,33 +60,33 @@
<browser:addform
label="Add Wiki Page"
name="AddWikiPage.html"
- schema="zope.app.wiki.interfaces.IWikiPage"
- content_factory="zope.app.wiki.wikipage.WikiPage"
- permission="zope.app.wiki.AddWikiPage"
+ schema="zwiki.interfaces.IWikiPage"
+ content_factory="zwiki.wikipage.WikiPage"
+ permission="zwiki.AddWikiPage"
fields="source type"
class=".wikipage.AddWikiPage" />
<browser:addMenuItem
- class="zope.app.wiki.wikipage.WikiPage"
+ class="zwiki.wikipage.WikiPage"
title="Wiki Page"
description="A Wiki Page"
- permission="zope.app.wiki.AddWikiPage"
+ permission="zwiki.AddWikiPage"
view="AddWikiPage.html" />
<browser:editform
- schema="zope.app.wiki.interfaces.IWikiPage"
- for="zope.app.wiki.interfaces.IWikiPage"
+ schema="zwiki.interfaces.IWikiPage"
+ for="zwiki.interfaces.IWikiPage"
label="Change Wiki Page"
name="edit.html"
- permission="zope.app.wiki.EditWikiPage"
+ permission="zwiki.EditWikiPage"
fields="source type"
class=".wikipage.EditWikiPage"
menu="zmi_views" title="Edit" />
<browser:pages
- for="zope.app.wiki.interfaces.IWikiPage"
+ for="zwiki.interfaces.IWikiPage"
class=".wikipage.GenericWikiPageViews"
- permission="zope.app.wiki.ViewWikiPage">
+ permission="zwiki.ViewWikiPage">
<browser:page name="breadcrumbs" attribute="breadcrumbs" />
<browser:page name="author" attribute="author" />
<browser:page name="modified" attribute="modified" />
@@ -95,26 +95,26 @@
</browser:pages>
<browser:pages
- for="zope.app.wiki.interfaces.IWikiPage"
+ for="zwiki.interfaces.IWikiPage"
class=".wikipage.ViewWikiPage"
- permission="zope.app.wiki.ViewWikiPage">
+ permission="zwiki.ViewWikiPage">
<browser:page name="view.html" template="view_page.pt"
menu="zmi_views" title="View" />
</browser:pages>
<browser:pages
- for="zope.app.wiki.interfaces.IWikiPage"
+ for="zwiki.interfaces.IWikiPage"
class=".wikipage.EditWikiParents"
- permission="zope.app.wiki.ReparentWikiPage">
+ permission="zwiki.ReparentWikiPage">
<browser:page name="parents.html" template="parents_page.pt"
menu="zmi_views" title="Parents" />
<browser:page name="setParents.html" attribute="setParents" />
</browser:pages>
<browser:pages
- for="zope.app.wiki.interfaces.IWikiPage"
+ for="zwiki.interfaces.IWikiPage"
class=".wikipage.MailSubscriptions"
- permission="zope.app.wiki.EditWikiPage">
+ permission="zwiki.EditWikiPage">
<browser:page name="subscriptions.html" template="subscriptions.pt"
menu="zmi_views" title="Subscriptions" />
<browser:page name="changeSubscriptions.html" attribute="change" />
@@ -122,11 +122,11 @@
<browser:defaultView
name="view.html"
- for="zope.app.wiki.interfaces.IWikiPage"/>
+ for="zwiki.interfaces.IWikiPage"/>
<browser:icon
name="zmi_icon"
- for="zope.app.wiki.interfaces.IWikiPage"
+ for="zwiki.interfaces.IWikiPage"
file="wikipage_icon.gif" />
<!-- Comment browser configuration -->
@@ -134,17 +134,17 @@
<browser:addform
label="Comment"
name="AddComment.html"
- schema="zope.app.wiki.interfaces.IComment"
- content_factory="zope.app.wiki.comment.Comment"
- permission="zope.app.wiki.AddWikiPage"
+ schema="zwiki.interfaces.IComment"
+ content_factory="zwiki.comment.Comment"
+ permission="zwiki.AddWikiPage"
fields="title source type"
class=".wikipage.AddComment" />
<browser:addMenuItem
- class="zope.app.wiki.comment.Comment"
+ class="zwiki.comment.Comment"
title="Comment"
description="A Comment"
- permission="zope.app.wiki.AddWikiPage"
+ permission="zwiki.AddWikiPage"
view="AddComment.html" />
<!-- Make a special WikiPage menu -->
@@ -154,7 +154,7 @@
title="Menu for Wiki Page related actions." />
<browser:menuItems menu="wikipage_actions"
- for="zope.app.wiki.interfaces.IWikiPage">
+ for="zwiki.interfaces.IWikiPage">
<browser:menuItem title="View" action="@@view.html"/>
<browser:menuItem title="Comment" action="./+/AddComment.html="/>
<browser:menuItem title="Edit" action="@@edit.html"/>
@@ -164,7 +164,7 @@
</browser:menuItems>
<browser:menuItems menu="wikipage_actions"
- for="zope.app.wiki.interfaces.IWiki">
+ for="zwiki.interfaces.IWiki">
<browser:menuItem title="Table of Contents" action="@@toc.html"/>
<browser:menuItem title="Search" action="@@search.html"/>
<browser:menuItem title="Subscriptions" action="@@subscriptions.html"/>
@@ -173,10 +173,10 @@
<!-- Register a browser-specific traverser -->
<view
- for="zope.app.wiki.interfaces.IWikiPage"
+ for="zwiki.interfaces.IWikiPage"
type="zope.publisher.interfaces.browser.IBrowserRequest"
provides="zope.publisher.interfaces.IPublishTraverse"
- factory="zope.app.wiki.traversal.WikiPageTraverser"
+ factory="zwiki.traversal.WikiPageTraverser"
permission="zope.Public"
/>
Modified: Zope3/trunk/src/wiki/browser/wiki.py
===================================================================
--- Zope3/trunk/src/zope/app/wiki/browser/wiki.py 2004-07-10 12:47:23 UTC (rev 26391)
+++ Zope3/trunk/src/wiki/browser/wiki.py 2004-07-13 17:08:10 UTC (rev 26483)
@@ -23,7 +23,7 @@
from zope.app.traversing.api import getName, getPath
from zope.app.container.browser.adding import Adding
-from zope.app.wiki.interfaces import IWikiPageHierarchy
+from zwiki.interfaces import IWikiPageHierarchy
class AddWiki(object):
"""Add a Wiki"""
@@ -33,7 +33,7 @@
if self.request.get('frontpage'):
page = removeAllProxies(
- zapi.createObject(None, 'zope.wiki.WikiPage'))
+ zapi.createObject(None, 'zwiki.WikiPage'))
page.type = u'zope.source.rest'
page.source = u'This is the FrontPage of the Wiki.'
dc = ICMFDublinCore(page)
@@ -73,7 +73,7 @@
for name, page in self.context.items():
hier = IWikiPageHierarchy(page)
- if hier.getParents() == ():
+ if hier.parents == ():
children.append((page, hier.findChildren()))
return self._branchHTML(children)
Modified: Zope3/trunk/src/wiki/browser/wikipage.py
===================================================================
--- Zope3/trunk/src/zope/app/wiki/browser/wikipage.py 2004-07-10 12:47:23 UTC (rev 26391)
+++ Zope3/trunk/src/wiki/browser/wikipage.py 2004-07-13 17:08:10 UTC (rev 26483)
@@ -26,8 +26,9 @@
from zope.app.form.browser.submit import Update
from zope.app.dublincore.interfaces import ICMFDublinCore
from zope.app.traversing.api import getParent, getPath, getName
-from zope.app.wiki.interfaces import IWikiPageHierarchy, IMailSubscriptions
+from zwiki.interfaces import IWikiPageHierarchy, IMailSubscriptions
+
urlchars = r'[A-Za-z0-9/:@_%~#=&\.\-\?\+\$,]+'
urlendchar = r'[A-Za-z0-9/]'
url = r'["=]?((about|gopher|http|https|ftp|mailto|file):%s)' %urlchars
Modified: Zope3/trunk/src/wiki/comment.py
===================================================================
--- Zope3/trunk/src/zope/app/wiki/comment.py 2004-07-10 12:47:23 UTC (rev 26391)
+++ Zope3/trunk/src/wiki/comment.py 2004-07-13 17:08:10 UTC (rev 26483)
@@ -23,8 +23,8 @@
from zope.app.dublincore.interfaces import ICMFDublinCore
from zope.app.filerepresentation.interfaces import IReadFile, IWriteFile
-from zope.app.wiki.interfaces import IComment
-from zope.app.wiki.interfaces import IWikiPageContained
+from zwiki.interfaces import IComment
+from zwiki.interfaces import IWikiPageContained
class Comment(Persistent, Contained):
@@ -66,13 +66,13 @@
"""
implements(IComment, IWikiPageContained)
- # See zope.app.wiki.interfaces.IComment
+ # See wiki.interfaces.IComment
source = u''
- # See zope.app.wiki.interfaces.IComment
+ # See wiki.interfaces.IComment
type = u'zope.source.rest'
- # See zope.app.wiki.interfaces.IComment
+ # See wiki.interfaces.IComment
def _getTitle(self):
dc = ICMFDublinCore(self)
return dc.title
Modified: Zope3/trunk/src/wiki/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/wiki/configure.zcml 2004-07-10 12:47:23 UTC (rev 26391)
+++ Zope3/trunk/src/wiki/configure.zcml 2004-07-13 17:08:10 UTC (rev 26483)
@@ -4,6 +4,9 @@
i18n_domain="zope"
>
+ <!-- Backward compatibility -->
+ <modulealias module="zwiki" alias="zope.app.wiki" />
+
<!-- Security definitions -->
<role
@@ -22,57 +25,57 @@
description="The Wiki Admin can fully manage wiki pages." />
<permission
- id="zope.app.wiki.ViewWikiPage"
+ id="zwiki.ViewWikiPage"
title="View Wiki Page"
description="View a Wiki Page" />
<grant
- permission="zope.app.wiki.ViewWikiPage"
+ permission="zwiki.ViewWikiPage"
role="zwiki.User" />
<permission
- id="zope.app.wiki.CommentWikiPage"
+ id="zwiki.CommentWikiPage"
title="Comment on Wiki Page"
description="Make a comment on Wiki Page" />
<grant
- permission="zope.app.wiki.CommentWikiPage"
+ permission="zwiki.CommentWikiPage"
role="zwiki.User" />
<permission
- id="zope.app.wiki.AddWikiPage"
+ id="zwiki.AddWikiPage"
title="Add Wiki Page"
description="Add Wiki Page" />
<grant
- permission="zope.app.wiki.AddWikiPage"
+ permission="zwiki.AddWikiPage"
role="zwiki.Editor" />
<permission
- id="zope.app.wiki.EditWikiPage"
+ id="zwiki.EditWikiPage"
title="Edit Wiki Page"
description="Edit Wiki Page" />
<grant
- permission="zope.app.wiki.EditWikiPage"
+ permission="zwiki.EditWikiPage"
role="zwiki.Editor" />
<permission
- id="zope.app.wiki.DeleteWikiPage"
+ id="zwiki.DeleteWikiPage"
title="Delete Wiki Page"
description="Delete Wiki Page" />
<grant
- permission="zope.app.wiki.DeleteWikiPage"
+ permission="zwiki.DeleteWikiPage"
role="zwiki.Admin" />
<permission
- id="zope.app.wiki.ReparentWikiPage"
+ id="zwiki.ReparentWikiPage"
title="Reparent Wiki Page"
description="Reparent a Wiki Page" />
<grant
- permission="zope.app.wiki.ReparentWikiPage"
+ permission="zwiki.ReparentWikiPage"
role="zwiki.Admin"/>
@@ -91,7 +94,7 @@
interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
<factory
- id="zope.wiki.Wiki"
+ id="zwiki.Wiki"
description="Minimal Wiki Page Container implementation " />
<require
@@ -99,7 +102,7 @@
interface="zope.app.container.interfaces.IReadContainer"/>
<require
- permission="zope.app.wiki.AddWikiPage"
+ permission="zwiki.AddWikiPage"
interface="zope.app.container.interfaces.IWriteContainer"/>
</content>
@@ -108,9 +111,22 @@
<adapter
factory=".wikipage.MailSubscriptions"
provides=".interfaces.IMailSubscriptions"
- for=".interfaces.IWiki" />
+ for=".interfaces.IWiki"
+ trusted="true"
+ />
+ <class class=".wikipage.MailSubscriptions">
+ <require
+ permission="zwiki.EditWikiPage"
+ attributes="getSubscriptions"
+ />
+ <require
+ permission="zwiki.EditWikiPage"
+ attributes="addSubscriptions removeSubscriptions"
+ />
+ </class>
+
<!-- Wiki Page Content Type -->
<interface
@@ -124,14 +140,15 @@
interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
<factory
- id="zope.wiki.WikiPage"
+ id="zwiki.WikiPage"
title="Wiki Page"
description="A Wiki Page" />
<allow interface=".interfaces.IWikiPage" />
+
<require
- permission="zope.app.wiki.AddWikiPage"
+ permission="zwiki.AddWikiPage"
set_schema=".interfaces.IWikiPage" />
</content>
@@ -139,8 +156,21 @@
<adapter
factory=".wikipage.WikiPageHierarchyAdapter"
provides=".interfaces.IWikiPageHierarchy"
- for=".interfaces.IWikiPage" />
+ for=".interfaces.IWikiPage"
+ trusted="true" />
+ <class class=".wikipage.WikiPageHierarchyAdapter">
+ <require
+ permission="zwiki.ViewWikiPage"
+ attributes="parents path findChildren"
+ />
+ <require
+ permission="zwiki.ReparentWikiPage"
+ attributes="reparent"
+ set_attributes="parents"
+ />
+ </class>
+
<!-- Wiki Comments support -->
<interface
@@ -154,14 +184,14 @@
interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
<factory
- id="zope.wiki.Comment"
+ id="zwiki.Comment"
title="Wiki Page Comment"
description="A Wiki Page Comment" />
<allow interface=".interfaces.IComment" />
<require
- permission="zope.app.wiki.CommentWikiPage"
+ permission="zwiki.CommentWikiPage"
set_schema=".interfaces.IComment" />
</content>
@@ -170,14 +200,14 @@
for=".interfaces.IComment"
provides="zope.app.filerepresentation.interfaces.IReadFile"
factory=".comment.CommentFile"
- permission="zope.app.wiki.ViewWikiPage"
+ permission="zwiki.ViewWikiPage"
/>
<adapter
for=".interfaces.IComment"
provides="zope.app.filerepresentation.interfaces.IWriteFile"
factory=".comment.CommentFile"
- permission="zope.app.wiki.CommentWikiPage"
+ permission="zwiki.CommentWikiPage"
/>
@@ -185,12 +215,16 @@
<adapter
factory=".wikipage.MailSubscriptions"
provides=".interfaces.IMailSubscriptions"
- for=".interfaces.IWikiPage" />
+ for=".interfaces.IWikiPage"
+ trusted="true"
+ />
<adapter
factory=".traversal.WikiPageTraversable"
provides="zope.app.traversing.interfaces.ITraversable"
- for=".interfaces.IWikiPage" />
+ for=".interfaces.IWikiPage"
+ trusted="true"
+ />
<!-- WikiPage FTP configurations -->
@@ -198,20 +232,20 @@
for=".interfaces.IWikiPage"
provides="zope.app.filerepresentation.interfaces.IReadDirectory"
factory=".wikipage.Directory"
- permission="zope.app.wiki.ViewWikiPage"
+ permission="zwiki.ViewWikiPage"
/>
<adapter
for=".interfaces.IWikiPage"
provides="zope.app.filerepresentation.interfaces.IWriteDirectory"
factory=".wikipage.Directory"
- permission="zope.app.wiki.CommentWikiPage"
+ permission="zwiki.CommentWikiPage"
/>
<adapter
for=".interfaces.IWikiPage"
provides="zope.app.filerepresentation.interfaces.IFileFactory"
- factory="zope.app.wiki.comment.CommentFileFactory"
+ factory="zwiki.comment.CommentFileFactory"
permission="zope.ManageContent"
/>
Modified: Zope3/trunk/src/wiki/tests/test_docstrings.py
===================================================================
--- Zope3/trunk/src/zope/app/wiki/tests/test_docstrings.py 2004-07-10 12:47:23 UTC (rev 26391)
+++ Zope3/trunk/src/wiki/tests/test_docstrings.py 2004-07-13 17:08:10 UTC (rev 26483)
@@ -26,7 +26,7 @@
from zope.app.dublincore.interfaces import ICMFDublinCore
from zope.app.tests import placelesssetup, ztapi
-from zope.app.wiki.interfaces import IComment
+from zwiki.interfaces import IComment
class DCStub(object):
@@ -62,10 +62,8 @@
def test_suite():
return unittest.TestSuite((
- DocTestSuite('zope.app.wiki.comment',
- setUp=setUp, tearDown=tearDown),
- DocTestSuite('zope.app.wiki.wikipage',
- setUp=setUp, tearDown=tearDown),
+ DocTestSuite('wiki.comment', setUp=setUp, tearDown=tearDown),
+ DocTestSuite('wiki.wikipage', setUp=setUp, tearDown=tearDown),
))
if __name__ == '__main__':
Modified: Zope3/trunk/src/wiki/tests/test_traversable.py
===================================================================
--- Zope3/trunk/src/zope/app/wiki/tests/test_traversable.py 2004-07-10 12:47:23 UTC (rev 26391)
+++ Zope3/trunk/src/wiki/tests/test_traversable.py 2004-07-13 17:08:10 UTC (rev 26483)
@@ -19,9 +19,9 @@
from zope.exceptions import NotFoundError
from zope.testing.cleanup import CleanUp
-from zope.app.wiki.wiki import Wiki
-from zope.app.wiki.wikipage import WikiPage
-from zope.app.wiki.traversal import WikiPageTraversable
+from zwiki.wiki import Wiki
+from zwiki.wikipage import WikiPage
+from zwiki.traversal import WikiPageTraversable
from zope.app.site.tests.placefulsetup import PlacefulSetup
Modified: Zope3/trunk/src/wiki/tests/test_traverser.py
===================================================================
--- Zope3/trunk/src/zope/app/wiki/tests/test_traverser.py 2004-07-10 12:47:23 UTC (rev 26391)
+++ Zope3/trunk/src/wiki/tests/test_traverser.py 2004-07-13 17:08:10 UTC (rev 26483)
@@ -30,11 +30,12 @@
from zope.app.tests import ztapi
from zope.app.tests.placelesssetup import PlacelessSetup
from zope.app.traversing.interfaces import IPhysicallyLocatable
-from zope.app.wiki.interfaces import IWikiPage, IWikiPageHierarchy
-from zope.app.wiki.wiki import Wiki
-from zope.app.wiki.wikipage import WikiPage, WikiPageHierarchyAdapter
-from zope.app.wiki.traversal import WikiPageTraverser
+from zwiki.interfaces import IWikiPage, IWikiPageHierarchy
+from zwiki.wiki import Wiki
+from zwiki.wikipage import WikiPage, WikiPageHierarchyAdapter
+from zwiki.traversal import WikiPageTraverser
+
class I(Interface):
pass
Modified: Zope3/trunk/src/wiki/tests/test_wiki.py
===================================================================
--- Zope3/trunk/src/zope/app/wiki/tests/test_wiki.py 2004-07-10 12:47:23 UTC (rev 26391)
+++ Zope3/trunk/src/wiki/tests/test_wiki.py 2004-07-13 17:08:10 UTC (rev 26483)
@@ -19,10 +19,11 @@
from zope.app.container.tests.test_icontainer import \
BaseTestIContainer, DefaultTestData
-from zope.app.wiki.wiki import Wiki
-from zope.app.wiki.interfaces import IWiki
+from zwiki.wiki import Wiki
+from zwiki.interfaces import IWiki
+
class Test(BaseTestIContainer, unittest.TestCase):
def makeTestObject(self):
Modified: Zope3/trunk/src/wiki/tests/test_wikimail.py
===================================================================
--- Zope3/trunk/src/zope/app/wiki/tests/test_wikimail.py 2004-07-10 12:47:23 UTC (rev 26391)
+++ Zope3/trunk/src/wiki/tests/test_wikimail.py 2004-07-13 17:08:10 UTC (rev 26483)
@@ -27,11 +27,11 @@
from zope.app.annotation.attribute import AttributeAnnotations
from zope.app.mail.interfaces import IMailDelivery
-from zope.app.wiki.interfaces import IWikiPage, IWiki, IMailSubscriptions
-from zope.app.wiki.interfaces import IWikiPageEditEvent
-from zope.app.wiki.wikipage import WikiPage
-from zope.app.wiki.wikipage import MailSubscriptions, WikiMailer, mailer
-from zope.app.wiki.wiki import Wiki
+from zwiki.interfaces import IWikiPage, IWiki, IMailSubscriptions
+from zwiki.interfaces import IWikiPageEditEvent
+from zwiki.wikipage import WikiPage
+from zwiki.wikipage import MailSubscriptions, WikiMailer, mailer
+from zwiki.wiki import Wiki
SubscriberKey = 'http://www.zope.org/zwiki#1.0/MailSubscriptions/emails'
Modified: Zope3/trunk/src/wiki/tests/test_wikipage.py
===================================================================
--- Zope3/trunk/src/zope/app/wiki/tests/test_wikipage.py 2004-07-10 12:47:23 UTC (rev 26391)
+++ Zope3/trunk/src/wiki/tests/test_wikipage.py 2004-07-13 17:08:10 UTC (rev 26483)
@@ -17,8 +17,8 @@
"""
import unittest
-from zope.app.wiki.wikipage import WikiPage
-from zope.app.wiki.interfaces import IWikiPage
+from zwiki.wikipage import WikiPage
+from zwiki.interfaces import IWikiPage
class Test(unittest.TestCase):
Modified: Zope3/trunk/src/wiki/tests/test_wikipagehierarchy.py
===================================================================
--- Zope3/trunk/src/zope/app/wiki/tests/test_wikipagehierarchy.py 2004-07-10 12:47:23 UTC (rev 26391)
+++ Zope3/trunk/src/wiki/tests/test_wikipagehierarchy.py 2004-07-13 17:08:10 UTC (rev 26483)
@@ -28,9 +28,9 @@
from zope.app.annotation.attribute import AttributeAnnotations
from zope.app.location.traversing import LocationPhysicallyLocatable
-from zope.app.wiki.interfaces import IWikiPage, IWikiPageHierarchy
-from zope.app.wiki.wikipage import WikiPage, WikiPageHierarchyAdapter
-from zope.app.wiki.wiki import Wiki
+from zwiki.interfaces import IWikiPage, IWikiPageHierarchy
+from zwiki.wikipage import WikiPage, WikiPageHierarchyAdapter
+from zwiki.wiki import Wiki
class TestAnnotations(dict):
implements(IAnnotations)
Modified: Zope3/trunk/src/wiki/traversal.py
===================================================================
--- Zope3/trunk/src/zope/app/wiki/traversal.py 2004-07-10 12:47:23 UTC (rev 26391)
+++ Zope3/trunk/src/wiki/traversal.py 2004-07-13 17:08:10 UTC (rev 26483)
@@ -23,8 +23,9 @@
from zope.app.traversing.api import getParent
from zope.app.traversing.namespace import UnexpectedParameters
from zope.app.traversing.interfaces import ITraversable
-from zope.app.wiki.interfaces import IWikiPage, IWikiPageHierarchy
+from zwiki.interfaces import IWikiPage, IWikiPageHierarchy
+
class WikiPageTraverser:
implements(IPublishTraverse)
__used_for__ = IWikiPage
Modified: Zope3/trunk/src/wiki/wiki.py
===================================================================
--- Zope3/trunk/src/zope/app/wiki/wiki.py 2004-07-10 12:47:23 UTC (rev 26391)
+++ Zope3/trunk/src/wiki/wiki.py 2004-07-13 17:08:10 UTC (rev 26483)
@@ -17,7 +17,7 @@
"""
from zope.interface import implements
from zope.app.folder import Folder
-from zope.app.wiki.interfaces import IWiki
+from zwiki.interfaces import IWiki
class Wiki(Folder):
__doc__ = IWiki.__doc__
Modified: Zope3/trunk/src/wiki/wikipage.py
===================================================================
--- Zope3/trunk/src/zope/app/wiki/wikipage.py 2004-07-10 12:47:23 UTC (rev 26391)
+++ Zope3/trunk/src/wiki/wikipage.py 2004-07-13 17:08:10 UTC (rev 26483)
@@ -34,11 +34,11 @@
IObjectAddedEvent, IObjectRemovedEvent
from zope.app.mail.interfaces import IMailDelivery
-from zope.app.wiki.interfaces import IWiki, IWikiPage
-from zope.app.wiki.interfaces import IWikiContained, IWikiPageContained
-from zope.app.wiki.interfaces import IWikiPageHierarchy, IMailSubscriptions
-from zope.app.wiki.interfaces import IWikiPageEditEvent
-from zope.app.wiki.diff import textdiff
+from zwiki.interfaces import IWiki, IWikiPage
+from zwiki.interfaces import IWikiContained, IWikiPageContained
+from zwiki.interfaces import IWikiPageHierarchy, IMailSubscriptions
+from zwiki.interfaces import IWikiPageEditEvent
+from zwiki.diff import textdiff
HierarchyKey = 'http://www.zope.org/zwiki#1.0/PageHierarchy/parents'
SubscriberKey = 'http://www.zope.org/zwiki#1.0/MailSubscriptions/emails'
@@ -61,10 +61,10 @@
self._source = source
notify(WikiPageEditEvent(self, old_source))
- # See zope.app.wiki.interfaces.IWikiPage
+ # See zwiki.interfaces.IWikiPage
source = property(_getSource, _setSource)
- # See zope.app.wiki.interfaces.IWikiPage
+ # See zwiki.interfaces.IWikiPage
type = u'zope.source.rest'
@@ -81,7 +81,7 @@
self._annotations[HierarchyKey] = ()
def reparent(self, parents):
- "See zope.app.wiki.interfaces.IWikiPageHierarchy"
+ "See zwiki.interfaces.IWikiPageHierarchy"
self.setParents(parents)
def setParents(self, parents):
@@ -93,7 +93,7 @@
parents = property(getParents, setParents)
def path(self):
- "See zope.app.wiki.interfaces.IWikiPageHierarchy"
+ "See zwiki.interfaces.IWikiPageHierarchy"
if not self.getParents():
return [self.context]
wiki = zapi.getParent(self.context)
@@ -102,7 +102,7 @@
return hier.path() + [self.context]
def findChildren(self, recursive=True):
- "See zope.app.wiki.interfaces.IWikiPageHierarchy"
+ "See zwiki.interfaces.IWikiPageHierarchy"
wiki = zapi.getParent(self.context)
contextName = zapi.name(self.context)
children = []
@@ -308,11 +308,11 @@
self._annotations[SubscriberKey] = ()
def getSubscriptions(self):
- "See zope.app.wiki.interfaces.IMailSubscriptions"
+ "See zwiki.interfaces.IMailSubscriptions"
return self._annotations[SubscriberKey]
def addSubscriptions(self, emails):
- "See zope.app.wiki.interfaces.IMailSubscriptions"
+ "See zwiki.interfaces.IMailSubscriptions"
subscribers = list(self._annotations[SubscriberKey])
for email in emails:
if email not in subscribers:
@@ -320,7 +320,7 @@
self._annotations[SubscriberKey] = tuple(subscribers)
def removeSubscriptions(self, emails):
- "See zope.app.wiki.interfaces.IMailSubscriptions"
+ "See zwiki.interfaces.IMailSubscriptions"
subscribers = list(self._annotations[SubscriberKey])
for email in emails:
if email in subscribers:
More information about the Zope3-Checkins
mailing list