[Zope3-checkins] CVS: zopeproducts/zwiki/browser - wiki.py:1.8 wikipage.py:1.8

[Philipp von Weitershausen]

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

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


=== zopeproducts/zwiki/browser/wiki.py 1.7 => 1.8 ===
--- zopeproducts/zwiki/browser/wiki.py:1.7	Thu Jun  5 09:34:25 2003
+++ zopeproducts/zwiki/browser/wiki.py	Mon Jun 23 17:46:50 2003
@@ -24,7 +24,7 @@
 from zope.proxy import removeAllProxies
 from zope.app.interfaces.dublincore import ICMFDublinCore
 from zope.app.services.servicenames import HubIds
-from zope.app.traversing import objectName, getPath
+from zope.app.traversing import getName, getPath
 from zope.app.browser.container.adding import Adding
 
 from zopeproducts.zwiki.interfaces import IWikiPageHierarchy
@@ -106,7 +106,7 @@
         except NotFoundError:
             pass
         else:
-            result['name'] = objectName(object)
+            result['name'] = getName(object)
         return result
 
 
@@ -127,8 +127,8 @@
     def _branchHTML(self, children):
         html = '<ul>\n'
         for child, subs in children:
-            html += ' <li><a href="%s">%s</a></li>\n' %(objectName(child),
-                                                        objectName(child))
+            html += ' <li><a href="%s">%s</a></li>\n' %(getName(child),
+                                                        getName(child))
             if subs:
                 html += self._branchHTML(subs)
         html += '</ul>\n'


=== zopeproducts/zwiki/browser/wikipage.py 1.7 => 1.8 ===
--- zopeproducts/zwiki/browser/wikipage.py:1.7	Thu Jun  5 09:34:25 2003
+++ zopeproducts/zwiki/browser/wikipage.py	Mon Jun 23 17:46:50 2003
@@ -26,7 +26,7 @@
 from zope.app.browser.form.widget import ListWidget
 from zope.app.browser.form.submit import Update
 from zope.app.form.widget import CustomWidget
-from zope.app.traversing import getParent, getPath, objectName
+from zope.app.traversing import getParent, getPath, getName
 
 from zopeproducts.zwiki.interfaces import \
      IWikiPageHierarchy, IMailSubscriptions
@@ -59,8 +59,8 @@
         path = hier.path()
         html = []
         for page in path:
-            html.append('<a href="../%s">%s</a>' %(objectName(page),
-                                                   objectName(page)))
+            html.append('<a href="../%s">%s</a>' %(getName(page),
+                                                   getName(page)))
         return ' / '.join(html)
 
     def author(self):
@@ -300,8 +300,8 @@
     def _branchHTML(self, children):
         html = '<ul>\n'
         for child, subs in children:
-            html += ' <li><a href="../%s">%s</a></li>\n' %(objectName(child),
-                                                           objectName(child))
+            html += ' <li><a href="../%s">%s</a></li>\n' %(getName(child),
+                                                           getName(child))
             if subs:
                 html += self._branchHTML(subs)
         html += '</ul>\n'