[Zope-Checkins] CVS: Zope2 - __init__.py:1.5

[shane@digicool.com]

Update of /cvs-repository/Zope2/lib/python/Products/ZopeTutorial
In directory korak:/tmp/cvs-serv17686/lib/python/Products/ZopeTutorial

Modified Files:
	__init__.py 
Log Message:
Merged RestrictedPythonBranch!



--- Updated File __init__.py in package Zope2 --
--- __init__.py	2000/08/01 22:48:15	1.4
+++ __init__.py	2001/04/27 20:27:50	1.5
@@ -90,7 +90,7 @@
 import stat
 from DateTime import DateTime
 from urllib import quote_plus
-from StructuredText.StructuredText import html_quote
+from cgi import escape
 import re
 from HelpSys import APIHelpTopic
 
@@ -163,7 +163,7 @@
     name=match.group(1)
     if name in terms:
         return """<a href="../tutorialGlossary#%s">%s</a>""" % \
-                (quote_plus(name), html_quote(name))
+                (quote_plus(name), escape(name))
     return """[%s]""" % name
 
 def defineTerm(match):
@@ -173,4 +173,4 @@
     name=match.group(1)
     terms.append(name)
     return """<a name="%s"></a>\n\n<strong>%s</strong>""" % \
-            (quote_plus(name), html_quote(name))
+            (quote_plus(name), escape(name))