[Checkins] SVN: zope3org/trunk/src/zorg/ Removed deprecation
warnings
Uwe Oestermeier
uwe_oestermeier at iwm-kmrc.de
Thu Jul 6 11:31:34 EDT 2006
Log message for revision 69006:
Removed deprecation warnings
Changed:
U zope3org/trunk/src/zorg/ajax/interfaces.py
U zope3org/trunk/src/zorg/ajax/page.py
U zope3org/trunk/src/zorg/ajax/tests.py
U zope3org/trunk/src/zorg/comment/README.txt
U zope3org/trunk/src/zorg/comment/browser/comment.py
U zope3org/trunk/src/zorg/comment/browser/templates/comment.pt
U zope3org/trunk/src/zorg/comment/comments.py
U zope3org/trunk/src/zorg/comment/interfaces.py
U zope3org/trunk/src/zorg/comment/testing.py
U zope3org/trunk/src/zorg/configure.zcml
U zope3org/trunk/src/zorg/edition/MOTIVATION.txt
U zope3org/trunk/src/zorg/edition/README.txt
U zope3org/trunk/src/zorg/edition/demo/tests.py
U zope3org/trunk/src/zorg/edition/demo/vproposal.py
U zope3org/trunk/src/zorg/edition/policies.py
U zope3org/trunk/src/zorg/edition/storage.py
U zope3org/trunk/src/zorg/edition/tests/test_versioncontrol.py
U zope3org/trunk/src/zorg/importer/README.txt
U zope3org/trunk/src/zorg/importer/testing.py
U zope3org/trunk/src/zorg/importer/zopeorgwikiimporter.py
U zope3org/trunk/src/zorg/kupusupport/browser/views.py
U zope3org/trunk/src/zorg/kupusupport/sample/tests.py
U zope3org/trunk/src/zorg/kupusupport/tests.py
U zope3org/trunk/src/zorg/live/demo/comment/README.txt
U zope3org/trunk/src/zorg/live/demo/comment/comment.py
U zope3org/trunk/src/zorg/live/demo/upload/upload.py
U zope3org/trunk/src/zorg/live/page/interfaces.py
U zope3org/trunk/src/zorg/live/page/page.py
U zope3org/trunk/src/zorg/live/testing.py
U zope3org/trunk/src/zorg/seen/README.txt
U zope3org/trunk/src/zorg/seen/interfaces.py
U zope3org/trunk/src/zorg/seen/seen.py
U zope3org/trunk/src/zorg/seen/testing.py
U zope3org/trunk/src/zorg/table/browser/form.py
U zope3org/trunk/src/zorg/table/browser/metaconfigure.py
U zope3org/trunk/src/zorg/table/browser/views.py
U zope3org/trunk/src/zorg/table/container/adapters.py
U zope3org/trunk/src/zorg/table/container/form.py
U zope3org/trunk/src/zorg/table/container/interfaces.py
U zope3org/trunk/src/zorg/table/container/view.py
U zope3org/trunk/src/zorg/table/ftests/ftests.py
U zope3org/trunk/src/zorg/table/ftests/test_readcontainer.py
U zope3org/trunk/src/zorg/table/ftests/testing.py
U zope3org/trunk/src/zorg/table/tests/test.zcml
U zope3org/trunk/src/zorg/table/tests/tests.py
U zope3org/trunk/src/zorg/wikification/browser/README.txt
U zope3org/trunk/src/zorg/wikification/browser/interfaces.py
U zope3org/trunk/src/zorg/wikification/browser/tests.py
U zope3org/trunk/src/zorg/wikification/browser/wikilink.py
U zope3org/trunk/src/zorg/wikification/browser/wikipage.py
U zope3org/trunk/src/zorg/wikification/tests.py
-=-
Modified: zope3org/trunk/src/zorg/ajax/interfaces.py
===================================================================
--- zope3org/trunk/src/zorg/ajax/interfaces.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/ajax/interfaces.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -24,7 +24,7 @@
from zope.schema import Bytes, BytesLine
from zope.app.container.interfaces import IContainer
-from zope.i18nmessageid import MessageFactory
+from zope.i18n import MessageFactory
_ = MessageFactory("zorg.ajax")
Modified: zope3org/trunk/src/zorg/ajax/page.py
===================================================================
--- zope3org/trunk/src/zorg/ajax/page.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/ajax/page.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -12,7 +12,6 @@
#
##############################################################################
"""
-
$Id: view.py 39651 2005-10-26 18:36:17Z oestermeier $
"""
__docformat__ = 'restructuredtext'
@@ -24,6 +23,7 @@
from persistent import Persistent
from BTrees.OOBTree import OOBTree
+
from zope.app import zapi
from zope.interface import implements
from zope.component import adapts
@@ -31,15 +31,13 @@
from zope.publisher.interfaces import IRequest
from zope.publisher.interfaces import IPublishTraverse
from zope.publisher.interfaces import NotFound
-
from zope.security.proxy import removeSecurityProxy
from zope.security.checker import defineChecker, NoProxy
-
+from zope.traversing.interfaces import TraversalError
+from zope.traversing.interfaces import ITraversable
from zope.app.session.interfaces import ISession
-from zope.app.datetimeutils import rfc1123_date
-from zope.app.traversing.interfaces import TraversalError
-from zope.app.traversing.interfaces import ITraversable
-from zope.app.publisher.browser import BrowserView
+from zope.datetime import rfc1123_date
+from zope.publisher.browser import BrowserView
from zorg.ajax.interfaces import IAjaxPage
Modified: zope3org/trunk/src/zorg/ajax/tests.py
===================================================================
--- zope3org/trunk/src/zorg/ajax/tests.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/ajax/tests.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -93,9 +93,6 @@
doctest.DocTestSuite('zorg.ajax.page', setUp=ajaxSetUp,
tearDown=ajaxTearDown,
optionflags=flags),
- doctest.DocTestSuite('zorg.ajax.livepage', setUp=ajaxSetUp,
- tearDown=ajaxTearDown,
- optionflags=flags),
))
if __name__ == '__main__':
Modified: zope3org/trunk/src/zorg/comment/README.txt
===================================================================
--- zope3org/trunk/src/zorg/comment/README.txt 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/comment/README.txt 2006-07-06 15:31:31 UTC (rev 69006)
@@ -58,9 +58,9 @@
>>> comments.addComment('foo')
1
- >>> from zope.app.event.tests.placelesssetup import events, clearEvents
+ >>> from zope.component.eventtesting import events, clearEvents
>>> len(events)
- 2
+ 3
>>> e = events.pop()
>>> (e.object == subject, e.__class__.__name__ ,
Modified: zope3org/trunk/src/zorg/comment/browser/comment.py
===================================================================
--- zope3org/trunk/src/zorg/comment/browser/comment.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/comment/browser/comment.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -21,11 +21,11 @@
from zope.interface import implements
from zope.component import adapts
+from zope.dublincore.interfaces import IZopeDublinCore
from zope.app import zapi
from zope.publisher.browser import TestRequest
+from zope.publisher.browser import BrowserView
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
-from zope.app.publisher.browser import BrowserView
-from zope.app.dublincore.interfaces import IZopeDublinCore
from zope.app.security.interfaces import PrincipalLookupError
from zorg.comment import IComments
Modified: zope3org/trunk/src/zorg/comment/browser/templates/comment.pt
===================================================================
--- zope3org/trunk/src/zorg/comment/browser/templates/comment.pt 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/comment/browser/templates/comment.pt 2006-07-06 15:31:31 UTC (rev 69006)
@@ -1,7 +1,7 @@
<a name="comment" tal:attributes="name string:comment${view/info/key}"></a>
<span class="entry-timestamp" style="float:left;" tal:content="view/info/key">
1.
-</span><span>. posted by </span><span tal:content="view/info/who">
+</span><span>. by </span><span tal:content="view/info/who">
Author
</span><span> at</span>
<span tal:content="view/info/when">
Modified: zope3org/trunk/src/zorg/comment/comments.py
===================================================================
--- zope3org/trunk/src/zorg/comment/comments.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/comment/comments.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -23,11 +23,11 @@
from zope.event import notify
from zope.interface import implements
-from zope.app.annotation.interfaces import IAnnotations
+from zope.annotation.interfaces import IAnnotations
from zope.app.file import File
-from zope.app.event.objectevent import Attributes, Sequence
-from zope.app.event.objectevent import ObjectCreatedEvent, ObjectModifiedEvent
-from zope.app.location import Location
+from zope.lifecycleevent import Attributes, Sequence
+from zope.lifecycleevent import ObjectCreatedEvent, ObjectModifiedEvent
+from zope.location import Location
from zorg.comment import IAnnotableComments
from zorg.comment import IComment
@@ -42,7 +42,7 @@
XXX This distinction should probably go into
- zope.app.event.objectevent.Sequence
+ zope.lifecycleevent.Sequence
later on.
"""
Modified: zope3org/trunk/src/zorg/comment/interfaces.py
===================================================================
--- zope3org/trunk/src/zorg/comment/interfaces.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/comment/interfaces.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -18,9 +18,9 @@
from zope.interface import Interface, Attribute
from zope.interface.common.mapping import IEnumerableMapping
-from zope.app.event.interfaces import ISequence
-from zope.app.annotation.interfaces import IAnnotatable
-from zope.app.annotation.interfaces import IAttributeAnnotatable
+from zope.annotation.interfaces import IAnnotatable
+from zope.annotation.interfaces import IAttributeAnnotatable
+from zope.lifecycleevent.interfaces import ISequence
from zope.app.file.interfaces import IFile
Modified: zope3org/trunk/src/zorg/comment/testing.py
===================================================================
--- zope3org/trunk/src/zorg/comment/testing.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/comment/testing.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -22,11 +22,11 @@
def commentSetUp(test=None) :
- # zope.app.annotations
- from zope.app.annotation.interfaces import IAnnotations
- from zope.app.annotation.interfaces import IAnnotatable
- from zope.app.annotation.interfaces import IAttributeAnnotatable
- from zope.app.annotation.attribute import AttributeAnnotations
+ # zope.annotations
+ from zope.annotation.interfaces import IAnnotations
+ from zope.annotation.interfaces import IAnnotatable
+ from zope.annotation.interfaces import IAttributeAnnotatable
+ from zope.annotation.attribute import AttributeAnnotations
zope.component.provideAdapter(AttributeAnnotations,
[IAttributeAnnotatable], IAnnotations)
@@ -42,8 +42,8 @@
from zorg.comment.comments import Comment
from zorg.comment.interfaces import IAttributeAnnotableComments
- from zope.app.dublincore.interfaces import IZopeDublinCore
- from zope.app.dublincore.annotatableadapter import ZDCAnnotatableAdapter
+ from zope.dublincore.interfaces import IZopeDublinCore
+ from zope.dublincore.annotatableadapter import ZDCAnnotatableAdapter
zope.interface.classImplements(File, IAnnotatable)
Modified: zope3org/trunk/src/zorg/configure.zcml
===================================================================
--- zope3org/trunk/src/zorg/configure.zcml 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/configure.zcml 2006-07-06 15:31:31 UTC (rev 69006)
@@ -10,6 +10,7 @@
<include package=".live" />
<include package=".wikification" />
<include package=".importer" />
+ <include package=".live" />
<include package=".kupusupport" />
<include package=".tinymcesupport" />
Modified: zope3org/trunk/src/zorg/edition/MOTIVATION.txt
===================================================================
--- zope3org/trunk/src/zorg/edition/MOTIVATION.txt 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/edition/MOTIVATION.txt 2006-07-06 15:31:31 UTC (rev 69006)
@@ -18,15 +18,15 @@
>>> from zope.interface import directlyProvides
>>> from ZODB.tests import util
>>> import zope.app.versioncontrol.interfaces
- >>> import zope.app.traversing.interfaces
+ >>> import zope.traversing.interfaces
>>> import zope.app.folder
>>> from zope.interface import implements
- >>> from zope.app.traversing.interfaces import IPhysicallyLocatable
+ >>> from zope.traversing.interfaces import IPhysicallyLocatable
>>> class TestFolder(zope.app.folder.Folder) :
... implements(IPhysicallyLocatable)
... def getPath(self) : return ""
>>> sample = TestFolder()
- >>> directlyProvides(sample, zope.app.traversing.interfaces.IContainmentRoot)
+ >>> directlyProvides(sample, zope.traversing.interfaces.IContainmentRoot)
>>> a = sample["a"] = TestFolder()
>>> b = sample["b"] = TestFolder()
>>> c = b["c"] = TestFolder()
@@ -151,7 +151,7 @@
The SimpleHistoryStorage.register method copies nothing. The copy process is
managed by a multi adapter that implements a versioning policy, i.e. determines
-how and what is versioned. The implementation here uses zope.app.copypastemove
+how and what is versioned. The implementation here uses zope.copypastemove
to save each version as a normal copy of the original content object.
>>> import zorg.edition.policies
Modified: zope3org/trunk/src/zorg/edition/README.txt
===================================================================
--- zope3org/trunk/src/zorg/edition/README.txt 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/edition/README.txt 2006-07-06 15:31:31 UTC (rev 69006)
@@ -89,7 +89,7 @@
>>> from zope.interface import directlyProvides
>>> from zope.app.folder import Folder, rootFolder
>>> from zope.app.testing.setup import setUpTraversal
- >>> from zope.app.traversing.interfaces import IPhysicallyLocatable
+ >>> from zope.traversing.interfaces import IPhysicallyLocatable
>>> from ZODB.tests import util
>>> from zorg.edition.tests.test_versioncontrol import buildRepository, buildDatabaseRoot
>>> db_root = buildDatabaseRoot()
@@ -99,7 +99,7 @@
... def getPath(self) :
... return ""
>>> sample = TestFolder()
- >>> directlyProvides(sample, zope.app.traversing.interfaces.IContainmentRoot)
+ >>> directlyProvides(sample, zope.traversing.interfaces.IContainmentRoot)
>>> db_root['sample'] = sample
>>> a = sample["a"] = TestFolder()
@@ -136,7 +136,7 @@
We need a way to adapt all objects into unique references for later
access:
ztapi.provideAdapter(IAnnotatable, ITicketOwner, TicketOwner)
- >>> ztapi.provideAdapter(zope.app.annotation.interfaces.IAnnotatable,
+ >>> ztapi.provideAdapter(zope.annotation.interfaces.IAnnotatable,
... interfaces.ITicketOwner,
... storage.TicketOwner)
Modified: zope3org/trunk/src/zorg/edition/demo/tests.py
===================================================================
--- zope3org/trunk/src/zorg/edition/demo/tests.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/edition/demo/tests.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -1,12 +1,13 @@
import unittest
from zope.testing.doctest import DocFileSuite, DocTestSuite
+from zope.annotation.interfaces import IAnnotatable, IAttributeAnnotatable
+
from zope.app.testing import placelesssetup
from zope.app.testing import ztapi
from zope.app.testing.setup import setUpAnnotations
-from zope.app.annotation.interfaces import IAnnotatable, IAttributeAnnotatable
-from zope.app.dublincore.interfaces import IZopeDublinCore
-from zope.app.dublincore.annotatableadapter import ZDCAnnotatableAdapter
+from zope.dublincore.interfaces import IZopeDublinCore
+from zope.dublincore.annotatableadapter import ZDCAnnotatableAdapter
from zope.interface.declarations import classImplements
Modified: zope3org/trunk/src/zorg/edition/demo/vproposal.py
===================================================================
--- zope3org/trunk/src/zorg/edition/demo/vproposal.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/edition/demo/vproposal.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -1,6 +1,6 @@
import persistent
import zope.interface
-from zope.app.dublincore.interfaces import IZopeDublinCore
+from zope.dublincore.interfaces import IZopeDublinCore
from zorg.edition.demo.interfaces import IVProposal
class VProposal(persistent.Persistent):
Modified: zope3org/trunk/src/zorg/edition/policies.py
===================================================================
--- zope3org/trunk/src/zorg/edition/policies.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/edition/policies.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -14,9 +14,9 @@
import unittest, doctest
from zope.interface import implements
-from zope.app.copypastemove.interfaces import IObjectCopier
+from zope.copypastemove.interfaces import IObjectCopier
from zope.app.container.interfaces import IContained
-from zope.app.traversing.interfaces import IContainmentRoot
+from zope.traversing.interfaces import IContainmentRoot
from interfaces import IVersionableAspects
Modified: zope3org/trunk/src/zorg/edition/storage.py
===================================================================
--- zope3org/trunk/src/zorg/edition/storage.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/edition/storage.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -21,13 +21,14 @@
from persistent.dict import PersistentDict
from persistent import Persistent
+from zope.annotation.interfaces import IAnnotatable
+from zope.annotation.interfaces import IAnnotations
+from zope.copypastemove.interfaces import IObjectCopier
+
from zope.app import zapi
from zope.app.container.btree import BTreeContainer
-from zope.app.annotation.interfaces import IAnnotatable
from zope.app.exception.interfaces import UserError
-from zope.app.copypastemove.interfaces import IObjectCopier
from zope.app.container.interfaces import INameChooser
-from zope.app.annotation.interfaces import IAnnotations
from zope.app.keyreference.interfaces import IKeyReference
from zope.security.management import queryInteraction
Modified: zope3org/trunk/src/zorg/edition/tests/test_versioncontrol.py
===================================================================
--- zope3org/trunk/src/zorg/edition/tests/test_versioncontrol.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/edition/tests/test_versioncontrol.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -34,42 +34,41 @@
import zope
import persistent
import zope.interface
-import zope.app.annotation.attribute
-import zope.app.annotation.interfaces
-import zope.app.traversing.interfaces
+import zope.annotation.attribute
+import zope.annotation.interfaces
+import zope.traversing.interfaces
import zope.app.versioncontrol.repository
import zope.interface.verify
+from zope.annotation.interfaces import IAttributeAnnotatable
+from zope.annotation.attribute import AttributeAnnotations
+from zope.annotation.interfaces import IAnnotatable, IAnnotations
+
from zope.app.versioncontrol import interfaces
from zope.app.testing import ztapi
from zope.app.testing.setup import setUpTraversal
from zope.interface import classImplements
-from zope.app.traversing.interfaces import ITraversable, ITraverser
-from zope.app.traversing.interfaces import IPhysicallyLocatable
-from zope.app.traversing.interfaces import IContainmentRoot
-from zope.app.traversing.adapters import DefaultTraversable
-from zope.app.location.traversing import LocationPhysicallyLocatable
-from zope.app.traversing.adapters import RootPhysicallyLocatable
-from zope.app.traversing.adapters import Traverser
+from zope.traversing.interfaces import ITraversable, ITraverser
+from zope.traversing.interfaces import IPhysicallyLocatable
+from zope.traversing.interfaces import IContainmentRoot
+from zope.traversing.adapters import DefaultTraversable
+from zope.traversing.adapters import RootPhysicallyLocatable
+from zope.traversing.adapters import Traverser
+from zope.location.traversing import LocationPhysicallyLocatable
+from zope.dublincore.interfaces import IZopeDublinCore
+from zope.dublincore.annotatableadapter import ZDCAnnotatableAdapter
+from zope.copypastemove.interfaces import IObjectCopier
+from zope.copypastemove import ObjectCopier
-from zope.app.annotation.interfaces import IAttributeAnnotatable
-from zope.app.annotation.attribute import AttributeAnnotations
-from zope.app.dublincore.interfaces import IZopeDublinCore
-from zope.app.dublincore.annotatableadapter import ZDCAnnotatableAdapter
-from zope.app.annotation.interfaces import IAnnotatable, IAnnotations
from zope.app.container.interfaces import IContainer
from zope.app.container.btree import BTreeContainer
from zope.app.file.interfaces import IFile
from zope.app.file.file import File
from zope.app.folder.folder import Folder
-
-from zope.app.copypastemove.interfaces import IObjectCopier
-from zope.app.copypastemove import ObjectCopier
-
from zope.app.container.interfaces import IWriteContainer, INameChooser
from zope.app.container.contained import NameChooser
-from zope.component.tests.placelesssetup import PlacelessSetup
+from zope.component.testing import PlacelessSetup
from zorg.edition.interfaces import IVersion, IUUIDGenerator, ITicketOwner
from zorg.edition.uuid import UUIDGenerator
Modified: zope3org/trunk/src/zorg/importer/README.txt
===================================================================
--- zope3org/trunk/src/zorg/importer/README.txt 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/importer/README.txt 2006-07-06 15:31:31 UTC (rev 69006)
@@ -39,7 +39,7 @@
A selection of the metadata will be copied also:
- >>> from zope.app.dublincore.interfaces import IZopeDublinCore
+ >>> from zope.dublincore.interfaces import IZopeDublinCore
>>> from datetime import datetime
>>> dc = IZopeDublinCore(file)
Modified: zope3org/trunk/src/zorg/importer/testing.py
===================================================================
--- zope3org/trunk/src/zorg/importer/testing.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/importer/testing.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -26,17 +26,17 @@
def setUp(self, doctesttest=None):
super(PlacelessSetup, self).setUp(doctesttest)
- # zope.app.annotations
- from zope.app.annotation.interfaces import IAnnotations
- from zope.app.annotation.attribute import AttributeAnnotations
+ # zope.annotations
+ from zope.annotation.interfaces import IAnnotations
+ from zope.annotation.attribute import AttributeAnnotations
from zope.app.file.interfaces import IFile
zope.component.provideAdapter(AttributeAnnotations,
[IFile], IAnnotations)
# dublin core annotations
- from zope.app.dublincore.interfaces import IWriteZopeDublinCore
- from zope.app.dublincore.annotatableadapter import ZDCAnnotatableAdapter
+ from zope.dublincore.interfaces import IWriteZopeDublinCore
+ from zope.dublincore.annotatableadapter import ZDCAnnotatableAdapter
zope.component.provideAdapter(ZDCAnnotatableAdapter,
[IFile], IWriteZopeDublinCore)
Modified: zope3org/trunk/src/zorg/importer/zopeorgwikiimporter.py
===================================================================
--- zope3org/trunk/src/zorg/importer/zopeorgwikiimporter.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/importer/zopeorgwikiimporter.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -26,12 +26,12 @@
import zope.interface
from zope.app import zapi
from zope.exceptions import DuplicationError
+from zope.dublincore.interfaces import IZopeDublinCore
+from zope.traversing.interfaces import TraversalError
from zope.app.file import File
from zope.app.folder import Folder
from zope.app.container.interfaces import IContainer
-from zope.app.dublincore.interfaces import IZopeDublinCore
-from zope.app.traversing.interfaces import TraversalError
from zorg.importer import IImporter
Modified: zope3org/trunk/src/zorg/kupusupport/browser/views.py
===================================================================
--- zope3org/trunk/src/zorg/kupusupport/browser/views.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/kupusupport/browser/views.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -15,12 +15,12 @@
from zope.event import notify
from zope.interface import implements
from zope.security.interfaces import Unauthorized
+from zope.lifecycleevent import ObjectModifiedEvent
from zope.app import zapi
-from zope.app.dublincore.interfaces import IZopeDublinCore
+from zope.dublincore.interfaces import IZopeDublinCore
from zope.app.container.interfaces import IContainer
-from zope.app.event.objectevent import ObjectModifiedEvent
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
from zorg.kupusupport.interfaces import IImageReadContainer
from zorg.kupusupport.interfaces import IImageLibrary
@@ -37,7 +37,7 @@
Preparation::
- >>> from zope.app.tests import placelesssetup, ztapi
+ >>> from zope.app.testing import placelesssetup, ztapi
>>> from zope.publisher.browser import TestRequest
>>> from zorg.kupusupport.interfaces import IKupuPolicy
@@ -71,7 +71,7 @@
There should be an ObjectModifiedEvent event logged:
- >>> from zope.app.event.tests.placelesssetup import getEvents
+ >>> from zope.component.eventtesting import getEvents
>>> from zope.app.event.interfaces import IObjectModifiedEvent
>>> [event] = getEvents(IObjectModifiedEvent)
>>> event.object is content
@@ -123,11 +123,11 @@
>>> from zope.interface import directlyProvides
>>> from zope.publisher.browser import TestRequest
- >>> from zope.app.annotation.interfaces import IAttributeAnnotatable, IAnnotations
- >>> from zope.app.annotation.attribute import AttributeAnnotations
- >>> from zope.app.dublincore.annotatableadapter import ZDCAnnotatableAdapter
- >>> from zope.app.dublincore.interfaces import IWriteZopeDublinCore
- >>> from zope.app.tests import setup, ztapi
+ >>> from zope.annotation.interfaces import IAttributeAnnotatable, IAnnotations
+ >>> from zope.annotation.attribute import AttributeAnnotations
+ >>> from zope.dublincore.annotatableadapter import ZDCAnnotatableAdapter
+ >>> from zope.dublincore.interfaces import IWriteZopeDublinCore
+ >>> from zope.app.testing import setup, ztapi
>>> from zope.app.file.interfaces import IImage
>>> from zorg.kupusupport.adapters import ImageReadContainer
Modified: zope3org/trunk/src/zorg/kupusupport/sample/tests.py
===================================================================
--- zope3org/trunk/src/zorg/kupusupport/sample/tests.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/kupusupport/sample/tests.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -16,7 +16,7 @@
import unittest
from zope.testing.doctest import DocTestSuite
-from zope.app.tests import placelesssetup
+from zope.app.testing import placelesssetup
def test_suite():
Modified: zope3org/trunk/src/zorg/kupusupport/tests.py
===================================================================
--- zope3org/trunk/src/zorg/kupusupport/tests.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/kupusupport/tests.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -16,7 +16,7 @@
import unittest
from zope.testing.doctest import DocTestSuite
-from zope.app.tests import placelesssetup
+from zope.app.testing import placelesssetup
def test_suite():
Modified: zope3org/trunk/src/zorg/live/demo/comment/README.txt
===================================================================
--- zope3org/trunk/src/zorg/live/demo/comment/README.txt 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/live/demo/comment/README.txt 2006-07-06 15:31:31 UTC (rev 69006)
@@ -118,7 +118,7 @@
>>> out1 = page1.output('uuid1')
>>> out1
- '{"html": "<div id=\\"comment1...", "where": null, "id": "comments"}'
+ '{..."html": "<div id=\\"comment1..."...}'
>>> out1 == page2.output('uuid2')
Modified: zope3org/trunk/src/zorg/live/demo/comment/comment.py
===================================================================
--- zope3org/trunk/src/zorg/live/demo/comment/comment.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/live/demo/comment/comment.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -23,13 +23,13 @@
from zope.interface import implements
from zope.component import adapts
+from zope.dublincore.interfaces import IZopeDublinCore
from zope.app import zapi
from zope.publisher.browser import TestRequest
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
-from zope.app.publisher.browser import BrowserView
-from zope.app.dublincore.interfaces import IZopeDublinCore
+from zope.publisher.browser import BrowserView
-from zope.app.event.interfaces import IObjectModifiedEvent
+from zope.lifecycleevent.interfaces import IObjectModifiedEvent
from zorg.edition.interfaces import IUUIDGenerator
from zorg.comment import IComments
Modified: zope3org/trunk/src/zorg/live/demo/upload/upload.py
===================================================================
--- zope3org/trunk/src/zorg/live/demo/upload/upload.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/live/demo/upload/upload.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -20,7 +20,7 @@
from zope.app import zapi
from zope.app.file.browser.file import FileUpdateView
from zope.app.file import File
-from zope.app.event import objectevent
+from zope import lifecycleevent
from zope.app.container.browser.adding import Adding
from zorg.live.page.client import LivePageClient
@@ -43,7 +43,7 @@
def update_object(self, data, contenttype):
f = File(data, contenttype)
- zope.event.notify(objectevent.ObjectCreatedEvent(f))
+ zope.event.notify(lifecycleevent.ObjectCreatedEvent(f))
adding = Adding(self.context, self.request)
adding.add(f)
Modified: zope3org/trunk/src/zorg/live/page/interfaces.py
===================================================================
--- zope3org/trunk/src/zorg/live/page/interfaces.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/live/page/interfaces.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -24,7 +24,7 @@
from zope.schema import Bytes, BytesLine
from zope.app.container.interfaces import IContainer
-from zope.i18nmessageid import MessageFactory
+from zope.i18n import MessageFactory
from zorg.ajax.interfaces import IAjaxPage
Modified: zope3org/trunk/src/zorg/live/page/page.py
===================================================================
--- zope3org/trunk/src/zorg/live/page/page.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/live/page/page.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -23,10 +23,10 @@
from zope.publisher.interfaces import IPublishTraverse
from zope.publisher.interfaces import NotFound
+from zope.publisher.browser import BrowserView
from zope.app import zapi
from zope.app.keyreference.interfaces import IKeyReference
-from zope.app.publisher.browser import BrowserView
from zope.app.intid.interfaces import IIntIds
from zope.app.twisted.interfaces import IServerType
Modified: zope3org/trunk/src/zorg/live/testing.py
===================================================================
--- zope3org/trunk/src/zorg/live/testing.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/live/testing.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -94,10 +94,10 @@
def setUp(self, doctesttest=None):
super(PlacelessSetup, self).setUp(doctesttest)
- # zope.app.annotations
- from zope.app.annotation.interfaces import IAnnotations
- from zope.app.annotation.interfaces import IAttributeAnnotatable
- from zope.app.annotation.attribute import AttributeAnnotations
+ # zope.annotations
+ from zope.annotation.interfaces import IAnnotations
+ from zope.annotation.interfaces import IAttributeAnnotatable
+ from zope.annotation.attribute import AttributeAnnotations
zope.component.provideAdapter(AttributeAnnotations,
[IAttributeAnnotatable], IAnnotations)
Modified: zope3org/trunk/src/zorg/seen/README.txt
===================================================================
--- zope3org/trunk/src/zorg/seen/README.txt 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/seen/README.txt 2006-07-06 15:31:31 UTC (rev 69006)
@@ -8,7 +8,7 @@
>>> from zope.app.container.contained import Contained
>>> from zope.interface import implements
- >>> from zope.app.annotation.interfaces import IAttributeAnnotatable
+ >>> from zope.annotation.interfaces import IAttributeAnnotatable
>>> from zorg.seen.interfaces import ISeeableAttributeAnnotable
>>> class Subject(Contained):
Modified: zope3org/trunk/src/zorg/seen/interfaces.py
===================================================================
--- zope3org/trunk/src/zorg/seen/interfaces.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/seen/interfaces.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -18,8 +18,8 @@
from zope.interface import Interface
-from zope.app.annotation.interfaces import IAnnotatable
-from zope.app.annotation.interfaces import IAttributeAnnotatable
+from zope.annotation.interfaces import IAnnotatable
+from zope.annotation.interfaces import IAttributeAnnotatable
from zope.interface.common.mapping import IEnumerableMapping
from zope.interface.common.mapping import IWriteMapping
Modified: zope3org/trunk/src/zorg/seen/seen.py
===================================================================
--- zope3org/trunk/src/zorg/seen/seen.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/seen/seen.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -24,10 +24,10 @@
from zope.event import notify
from zope.interface import implements
-from zope.app.annotation.interfaces import IAnnotations
-from zope.app.event.objectevent import ObjectModifiedEvent
-from zope.app.event.objectevent import Sequence, Attributes
-from zope.app.location import Location
+from zope.annotation.interfaces import IAnnotations
+from zope.lifecycleevent import ObjectModifiedEvent
+from zope.lifecycleevent import Sequence, Attributes
+from zope.location import Location
from zorg.seen.interfaces import ISeeable
from zorg.seen.interfaces import ISeen
Modified: zope3org/trunk/src/zorg/seen/testing.py
===================================================================
--- zope3org/trunk/src/zorg/seen/testing.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/seen/testing.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -27,10 +27,10 @@
def setUp(self, doctesttest=None):
super(PlacelessSetup, self).setUp(doctesttest)
- # zope.app.annotations
- from zope.app.annotation.interfaces import IAnnotations
- from zope.app.annotation.interfaces import IAttributeAnnotatable
- from zope.app.annotation.attribute import AttributeAnnotations
+ # zope.annotations
+ from zope.annotation.interfaces import IAnnotations
+ from zope.annotation.interfaces import IAttributeAnnotatable
+ from zope.annotation.attribute import AttributeAnnotations
zope.component.provideAdapter(AttributeAnnotations,
[IAttributeAnnotatable], IAnnotations)
Modified: zope3org/trunk/src/zorg/table/browser/form.py
===================================================================
--- zope3org/trunk/src/zorg/table/browser/form.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/table/browser/form.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -5,8 +5,10 @@
from zope.app.form.browser.interfaces import IWidgetInputErrorView
from zope.formlib import form
-from zope.formlib.i18n import _
+from zope.i18nmessageid import MessageFactory
+_ = MessageFactory("zope")
+
from interfaces import ITableForm
Modified: zope3org/trunk/src/zorg/table/browser/metaconfigure.py
===================================================================
--- zope3org/trunk/src/zorg/table/browser/metaconfigure.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/table/browser/metaconfigure.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -6,9 +6,9 @@
from zope.publisher.interfaces.browser import IDefaultBrowserLayer
from zope.publisher.interfaces.browser import IBrowserRequest
from zope.interface import implements, Interface
+from zope.publisher.browser import viewmeta
from zope.app.component.metaconfigure import utility
from zope.app.component import metaconfigure
-from zope.app.publisher.browser import viewmeta
from zope.app.publisher.interfaces.browser import IBrowserView
from zope.app.pagetemplate.engine import TrustedEngine
from zope.configuration.exceptions import ConfigurationError
Modified: zope3org/trunk/src/zorg/table/browser/views.py
===================================================================
--- zope3org/trunk/src/zorg/table/browser/views.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/table/browser/views.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -8,7 +8,7 @@
from zope.security.checker import defineChecker, NamesChecker
from zope.app import zapi
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
from zope.app.pagetemplate.simpleviewclass import SimpleViewClass
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
from zope.app.form.interfaces import IDisplayWidget, IInputWidget
Modified: zope3org/trunk/src/zorg/table/container/adapters.py
===================================================================
--- zope3org/trunk/src/zorg/table/container/adapters.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/table/container/adapters.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -1,6 +1,6 @@
from interfaces import IMovableLocation
from zope.interface import implements
-from zope.app.copypastemove.interfaces import IContainerItemRenamer
+from zope.copypastemove.interfaces import IContainerItemRenamer
class MovableLocation(object):
Modified: zope3org/trunk/src/zorg/table/container/form.py
===================================================================
--- zope3org/trunk/src/zorg/table/container/form.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/table/container/form.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -7,19 +7,20 @@
from zope.event import notify
from zope.security.interfaces import Unauthorized
-from zope.app.exception.interfaces import UserError
-from zope.app.traversing.interfaces import TraversalError
+from zope.exception.interfaces import UserError
+from zope.traversing.interfaces import TraversalError
from zope.app import zapi
-from zope.app.event.objectevent import ObjectModifiedEvent
-from zope.app.copypastemove.interfaces import IPrincipalClipboard
-from zope.app.copypastemove.interfaces import IObjectCopier
-from zope.app.copypastemove.interfaces import IObjectMover
+from zope.lifecycleevent import ObjectModifiedEvent
+from zope.copypastemove.interfaces import IPrincipalClipboard
+from zope.copypastemove.interfaces import IObjectCopier
+from zope.copypastemove.interfaces import IObjectMover
from zope.app.principalannotation.interfaces import IPrincipalAnnotationUtility
from zope.app.container.interfaces import DuplicateIDError
from zope.formlib import form
-from zope.formlib.i18n import _
+from zope.i18nmessageid import MessageFactory
+_ = MessageFactory("zope")
from zorg.table.browser.form import TableFormBase, RowFormBase
from zorg.table.browser.form import tableAction, rowAction
Modified: zope3org/trunk/src/zorg/table/container/interfaces.py
===================================================================
--- zope3org/trunk/src/zorg/table/container/interfaces.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/table/container/interfaces.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -1,4 +1,4 @@
-from zope.app.location.interfaces import ILocation
+from zope.location.interfaces import ILocation
from zope import schema
from zope.interface import Interface, Attribute
Modified: zope3org/trunk/src/zorg/table/container/view.py
===================================================================
--- zope3org/trunk/src/zorg/table/container/view.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/table/container/view.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -1,7 +1,7 @@
from zope.app import zapi
-from zope.app.publisher.browser import BrowserView
-from zope.app.copypastemove.interfaces import IContainerItemRenamer
+from zope.publisher.browser import BrowserView
+from zope.copypastemove.interfaces import IContainerItemRenamer
from zope.app.form.interfaces import IInputWidget,IDisplayWidget
from zorg.table.browser.interfaces import ITableView
Modified: zope3org/trunk/src/zorg/table/ftests/ftests.py
===================================================================
--- zope3org/trunk/src/zorg/table/ftests/ftests.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/table/ftests/ftests.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -1,6 +1,6 @@
import unittest
from zope.app.testing.functional import BrowserTestCase
-from zope.app.rdb.interfaces import IZopeDatabaseAdapter
+from zope.rdb.interfaces import IZopeDatabaseAdapter
from zope.app import zapi
basic = 'mgr:mgrpw'
Modified: zope3org/trunk/src/zorg/table/ftests/test_readcontainer.py
===================================================================
--- zope3org/trunk/src/zorg/table/ftests/test_readcontainer.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/table/ftests/test_readcontainer.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -1,6 +1,6 @@
import unittest
from zope.app.testing.functional import BrowserTestCase
-from zope.app.rdb.interfaces import IZopeDatabaseAdapter
+from zope.rdb.interfaces import IZopeDatabaseAdapter
from zope.app import zapi
from zope.configuration import xmlconfig
from zope.app.testing import ztapi
@@ -23,7 +23,7 @@
i18n_domain="zope"
package="table.ftests"
>
- <include package="zope.app.publisher.browser"
+ <include package="zope.publisher.browser"
file="meta.zcml"/>
<page
Modified: zope3org/trunk/src/zorg/table/ftests/testing.py
===================================================================
--- zope3org/trunk/src/zorg/table/ftests/testing.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/table/ftests/testing.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -1,9 +1,9 @@
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
from zope.interface import Interface, implements
from zope.app import zapi
-from zope.app.location.interfaces import ILocation
+from zope.location.interfaces import ILocation
from zorg.table.table import TableConfig
class TestView(BrowserView):
Modified: zope3org/trunk/src/zorg/table/tests/test.zcml
===================================================================
--- zope3org/trunk/src/zorg/table/tests/test.zcml 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/table/tests/test.zcml 2006-07-06 15:31:31 UTC (rev 69006)
@@ -9,7 +9,7 @@
<include package="zope.app.component" file="meta.zcml"/>
<include package="zope.app.schema" file="meta.zcml"/>
<include package="zope.app.security"/>
- <include package="zope.app.publisher.browser" file="meta.zcml"/>
+ <include package="zope.publisher.browser" file="meta.zcml"/>
<include package="zope.app" file="menus.zcml"/>
<include package="zope.app.pagetemplate" file="meta.zcml"/>
<!--
@@ -20,13 +20,13 @@
-->
<include package="zope.app.container"/>
<!--
- <include package="zope.app.dublincore"/>
+ <include package="zope.dublincore"/>
-->
- <include package="zope.app.size"/>
+ <include package="zope.size"/>
<include package="zope.app.form.browser"/>
<include package="zope.app.pagetemplate"/>
<include package="zope.app.component"/>
- <include package="zope.app.traversing.browser"/>
+ <include package="zope.traversing.browser"/>
</configure>
\ No newline at end of file
Modified: zope3org/trunk/src/zorg/table/tests/tests.py
===================================================================
--- zope3org/trunk/src/zorg/table/tests/tests.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/table/tests/tests.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -2,7 +2,7 @@
from zope.app.testing import setup
from zope.app.container.sample import SampleContainer
from zope.interface import Interface,implements,directlyProvides
-from zope.app.traversing.interfaces import ITraversable
+from zope.traversing.interfaces import ITraversable
from zope.schema import Int
from zope.schema.interfaces import IField
from zope.app.container.interfaces import IReadContainer
@@ -10,14 +10,14 @@
from zorg.table.sort import SchemaSorter,MethodSorter
from zorg.table.table import IRow,ITable,ICell,IColumn,ISorter
from zope.component import provideAdapter,provideUtility
-from zope.app.size.interfaces import ISized
-from zope.app.size import DefaultSized
+from zope.size.interfaces import ISized
+from zope.size import DefaultSized
from zope.interface.interfaces import IMethod
from zope.publisher.browser import TestRequest
from zope.app.testing import ztapi
from zorg.table.browser.views import CellView,TableView
from zope.configuration import xmlconfig
-from zope.app.traversing.interfaces import IContainmentRoot
+from zope.traversing.interfaces import IContainmentRoot
import zope
import zorg.table.tests
Modified: zope3org/trunk/src/zorg/wikification/browser/README.txt
===================================================================
--- zope3org/trunk/src/zorg/wikification/browser/README.txt 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/wikification/browser/README.txt 2006-07-06 15:31:31 UTC (rev 69006)
@@ -60,7 +60,7 @@
It uses the Dublin Core title (or "Untitled" if the title is not set).
- >>> from zope.app.dublincore.interfaces import IZopeDublinCore
+ >>> from zope.dublincore.interfaces import IZopeDublinCore
>>> index_page.title == IZopeDublinCore(context).title
True
Modified: zope3org/trunk/src/zorg/wikification/browser/interfaces.py
===================================================================
--- zope3org/trunk/src/zorg/wikification/browser/interfaces.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/wikification/browser/interfaces.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -19,7 +19,8 @@
from zope.interface import Interface
from zope.interface import Attribute
-from zope.i18nmessageid import MessageFactory
+from zope.i18n import MessageFactory
+
_ = MessageFactory("zorg.wikification")
Modified: zope3org/trunk/src/zorg/wikification/browser/tests.py
===================================================================
--- zope3org/trunk/src/zorg/wikification/browser/tests.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/wikification/browser/tests.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -8,11 +8,12 @@
from zope.app.testing.setup import placefulSetUp, placefulTearDown
from zope.interface import classImplements
+from zope.annotation.interfaces import IAttributeAnnotatable
+from zope.annotation.interfaces import IAnnotations
+from zope.annotation.interfaces import IAnnotatable
+from zope.annotation.attribute import AttributeAnnotations
+
from zope.app import zapi
-from zope.app.annotation.interfaces import IAttributeAnnotatable
-from zope.app.annotation.interfaces import IAnnotations
-from zope.app.annotation.interfaces import IAnnotatable
-from zope.app.annotation.attribute import AttributeAnnotations
from zope.app.container.interfaces import IContained
Modified: zope3org/trunk/src/zorg/wikification/browser/wikilink.py
===================================================================
--- zope3org/trunk/src/zorg/wikification/browser/wikilink.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/wikification/browser/wikilink.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -25,15 +25,16 @@
from zope.interface import implements
from zope.component import adapts
from zope.app import zapi
+from zope.dublincore.interfaces import IZopeDublinCore
+from zope.lifecycleevent import ObjectCreatedEvent
+
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
-from zope.app.dublincore.interfaces import IZopeDublinCore
from zope.app.file import File
from zope.app.file.image import Image
from zope.app.folder import Folder
from zope.app.file.interfaces import IFile
-from zope.app.event.objectevent import ObjectCreatedEvent
from zope.app.container.interfaces import INameChooser
-from zope.app.traversing.interfaces import TraversalError
+from zope.traversing.interfaces import TraversalError
from zope.publisher.browser import TestRequest
from zorg.ajax.page import PageElement
Modified: zope3org/trunk/src/zorg/wikification/browser/wikipage.py
===================================================================
--- zope3org/trunk/src/zorg/wikification/browser/wikipage.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/wikification/browser/wikipage.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -19,16 +19,17 @@
import zope.event
from zope.app import zapi
from zope.interface import implements
-from zope.app.traversing.interfaces import TraversalError
+from zope.dublincore.interfaces import IZopeDublinCore
+from zope.lifecycleevent import ObjectCreatedEvent
+from zope.lifecycleevent import ObjectModifiedEvent
+from zope.traversing.interfaces import TraversalError
+from zope.traversing.interfaces import IPhysicallyLocatable
+from zope.publisher.browser import BrowserView
+
from zope.app.folder import Folder
from zope.app.file import File
from zope.app.file.interfaces import IFile
from zope.app.container.interfaces import IContainer
-from zope.app.publisher.browser import BrowserView
-from zope.app.traversing.interfaces import IPhysicallyLocatable
-from zope.app.dublincore.interfaces import IZopeDublinCore
-from zope.app.event.objectevent import ObjectCreatedEvent
-from zope.app.event.objectevent import ObjectModifiedEvent
from zope.app.session.interfaces import ISession
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
@@ -36,7 +37,7 @@
from zope.security.interfaces import ForbiddenAttribute
from zope.publisher.browser import TestRequest
-from zope.i18nmessageid import MessageFactory
+from zope.i18n import MessageFactory
_ = MessageFactory("zorg.wikification")
@@ -682,7 +683,8 @@
"""
if self.isAddView() :
filepath = self.request.form.get('add', '')
- return filepath.split(u'/')
+ names = filepath.split(u'/')
+ return [self.proposePageName(name) for name in names]
else :
return ['index.html']
Modified: zope3org/trunk/src/zorg/wikification/tests.py
===================================================================
--- zope3org/trunk/src/zorg/wikification/tests.py 2006-07-06 14:25:04 UTC (rev 69005)
+++ zope3org/trunk/src/zorg/wikification/tests.py 2006-07-06 15:31:31 UTC (rev 69006)
@@ -25,26 +25,25 @@
from zope.testing import doctest, doctestunit
from zope.app import zapi
-from zope.app.annotation.interfaces import IAttributeAnnotatable
-from zope.app.annotation.interfaces import IAnnotations
-from zope.app.annotation.interfaces import IAnnotatable
-from zope.app.annotation.attribute import AttributeAnnotations
+from zope.annotation.interfaces import IAttributeAnnotatable
+from zope.annotation.interfaces import IAnnotations
+from zope.annotation.interfaces import IAnnotatable
+from zope.annotation.attribute import AttributeAnnotations
+from zope.dublincore.interfaces import IZopeDublinCore
+from zope.dublincore.annotatableadapter import ZDCAnnotatableAdapter
+from zope.traversing.interfaces import ITraversable, ITraverser
+from zope.traversing.interfaces import IPhysicallyLocatable
+from zope.traversing.interfaces import IContainmentRoot
+from zope.traversing.adapters import DefaultTraversable
+from zope.location.traversing import LocationPhysicallyLocatable
+from zope.traversing.adapters import RootPhysicallyLocatable
+from zope.traversing.adapters import Traverser
+
from zope.app.container.interfaces import IContained
from zope.app.container.contained import NameChooser
from zope.app.container.interfaces import INameChooser
from zope.app.folder.interfaces import IFolder
-from zope.app.traversing.interfaces import ITraversable, ITraverser
-from zope.app.traversing.interfaces import IPhysicallyLocatable
-from zope.app.traversing.interfaces import IContainmentRoot
-from zope.app.traversing.adapters import DefaultTraversable
-from zope.app.location.traversing import LocationPhysicallyLocatable
-from zope.app.traversing.adapters import RootPhysicallyLocatable
-from zope.app.traversing.adapters import Traverser
-
-from zope.app.dublincore.interfaces import IZopeDublinCore
-from zope.app.dublincore.annotatableadapter import ZDCAnnotatableAdapter
-
from zope.app.folder import rootFolder
from zope.app.folder import Folder
from zope.app.file import File
More information about the Checkins
mailing list