[Zope3-checkins] CVS: Zope3/src/zope/app/onlinehelp - __init__.py:1.4.10.1

[Grégoire Weber]

Update of /cvs-repository/Zope3/src/zope/app/onlinehelp
In directory cvs.zope.org:/tmp/cvs-serv24874/src/zope/app/onlinehelp

Modified Files:
      Tag: cw-mail-branch
	__init__.py 
Log Message:
Synced up with HEAD

=== Zope3/src/zope/app/onlinehelp/__init__.py 1.4 => 1.4.10.1 ===
--- Zope3/src/zope/app/onlinehelp/__init__.py:1.4	Thu May  1 15:35:24 2003
+++ Zope3/src/zope/app/onlinehelp/__init__.py	Sun Jun 22 10:23:16 2003
@@ -20,18 +20,19 @@
 """
 import os
 from zope.app.container.sample import SampleContainer
-from zope.app.traversing import getParent, objectName
+from zope.app.traversing import getParent, getName
 from zope.app.interfaces.traversing import IContainmentRoot
 from zope.app.traversing.adapters import Traverser
 import zope.app
-from zope.proxy.context import ContextWrapper
+from zope.app.context import ContextWrapper
 
 from zope.app.interfaces.onlinehelp import IOnlineHelpTopic, IOnlineHelp
+from zope.interface import implements
 
 class OnlineHelpTopic(SampleContainer):
     __doc__ = IOnlineHelpTopic.__doc__
 
-    __implements__ =  IOnlineHelpTopic
+    implements(IOnlineHelpTopic)
 
     def __init__(self, title, path, doc_type='txt'):
         """Initialize object."""
@@ -57,7 +58,7 @@
     def getContent(self):
         "See Zope.App.OnlineHelp.interfaces.IOnlineHelpTopic"
         raw = open(self._content_path).read()
-        
+
         if self._doc_type == 'txt':
             return '<p>' + raw.replace('\n\n', '\n</p><p>') + '</p>'
         else:
@@ -67,7 +68,7 @@
 class OnlineHelp(OnlineHelpTopic):
     __doc__ = IOnlineHelp.__doc__
 
-    __implements__ =  IOnlineHelp, IContainmentRoot
+    implements(IOnlineHelp, IContainmentRoot)
 
     def __init__(self, title, path, doc_type='txt'):
         self._registry = {}
@@ -94,7 +95,7 @@
         "See Zope.App.OnlineHelp.interfaces.IOnlineHelp"
         # Delete topic from tree
         topic = Traverser(self).traverse(topic_path)
-        name = objectName(topic)
+        name = getName(topic)
         parent = getParent(topic)
         del parent[name]
         # unregister from registry