[Zope3-checkins] CVS: zopeproducts/zwiki - wikipage.py:1.7

[Philipp von Weitershausen]

Update of /cvs-repository/zopeproducts/zwiki
In directory cvs.zope.org:/tmp/cvs-serv21116

Modified Files:
	wikipage.py 
Log Message:
Keep up to date with Z3 head (specifically: changes in zope.app.traversal).


=== zopeproducts/zwiki/wikipage.py 1.6 => 1.7 ===
--- zopeproducts/zwiki/wikipage.py:1.6	Thu Jun  5 09:34:24 2003
+++ zopeproducts/zwiki/wikipage.py	Mon Jun 23 17:46:49 2003
@@ -21,7 +21,7 @@
 from zope.interface import implements
 from zope.component import getAdapter
 from zope.app.context import ContextWrapper
-from zope.app.traversing import getParent, objectName
+from zope.app.traversing import getParent, getName
 
 from zope.app.interfaces.index.text import ISearchableText
 from zope.app.interfaces.file import IReadFile, IWriteFile
@@ -107,7 +107,7 @@
     def findChildren(self, recursive=True):
         "See zopeproducts.zwiki.interfaces.IWikiPageHierarchy"
         wiki = getParent(self.context)
-        contextName = objectName(self.context)
+        contextName = getName(self.context)
         children = []
         for pageName in wiki:
             wrapped = ContextWrapper(wiki[pageName], wiki, name=pageName)
@@ -232,7 +232,7 @@
                 self.handleRemoved(event.object)
 
     def handleAdded(self, object):
-        subject = 'Added: '+objectName(object)
+        subject = 'Added: '+getName(object)
         emails = self.getAllSubscribers(object)
         body = object.source
         self.mail(emails, subject, body)        
@@ -240,13 +240,13 @@
     def handleModified(self, object):
         # XXX: Should have some nice diff code here.
         # from diff import textdiff
-        subject = 'Modified: '+objectName(object)
+        subject = 'Modified: '+getName(object)
         emails = self.getAllSubscribers(object)
         body = object.source
         self.mail(emails, subject, body)
 
     def handleRemoved(self, object):
-        subject = 'Removed: '+objectName(object)
+        subject = 'Removed: '+getName(object)
         emails = self.getAllSubscribers(object)
         body = subject
         self.mail(emails, subject, body)