Some HTML comments were terminated incorrectly with just '>' rather than '-->'.

Corrected. Also, someone apparently thought that XML comments can terminate with just an angle bracket. See: http://www.w3.org/TR/1998/REC-xml-19980210#sec-comments

Some HTML comments were terminated incorrectly with just '>' rather than '-->'.
Corrected. Also, someone apparently thought that XML comments can terminate with just an angle bracket. See: http://www.w3.org/TR/1998/REC-xml-19980210#sec-comments
e3a0fe92 · Shane Hathaway · 432d8b3c · e3a0fe92 · e3a0fe92 · e3a0fe92
Commit e3a0fe92 authored May 04, 2000 by Shane Hathaway
8 changed files
--- a/lib/python/AccessControl/access.dtml
+++ b/lib/python/AccessControl/access.dtml
@@ -38,7 +38,7 @@ td {
  font-size: 10pt;
  color: black;
 }
->
+-->
 </style>

 <dtml-with expr="_.namespace(valid_roles=valid_roles())">

--- a/lib/python/App/profile.dtml
+++ b/lib/python/App/profile.dtml
@@ -13,7 +13,7 @@ font-size: 10pt;
 font-size: 10pt;
 }

->
+-->
 </style>
 </head>
 <body bgcolor="#FFFFFF" link="#000099" vlink="#555555">

--- a/lib/python/OFS/DTMLMethod.py
+++ b/lib/python/OFS/DTMLMethod.py
@@ -84,7 +84,7 @@
 ##############################################################################
 """DTML Method objects."""

-__version__='$Revision: 1.41 $'[11:-2]
+__version__='$Revision: 1.42 $'[11:-2]

 from Globals import HTML, HTMLFile, MessageDialog
 from string import join,split,strip,rfind,atoi,lower
@@ -298,7 +298,7 @@ class DTMLMethod(cDocument, HTML, Acquisition.Implicit, RoleManager,

        raise 'Forbidden', (
            'You are not authorized to change <em>%s</em> because you '
-            'do not have proxy roles.\n<!--%s, %s>' % (self.__name__, u, roles))
+            'do not have proxy roles.\n<!--%s, %s-->' % (self.__name__, u, roles))
            

    def manage_proxy(self, roles=(), REQUEST=None):

--- a/lib/python/OFS/brokenEdit.dtml
+++ b/lib/python/OFS/brokenEdit.dtml
@@ -15,7 +15,7 @@ and will be accessible again if the product is reinstalled.

 <!-- 
  <dtml-var info> 
-  >
+-->

 </BODY>
 </HTML>

--- a/lib/python/Products/ZGadflyDA/DA.py
+++ b/lib/python/Products/ZGadflyDA/DA.py
@@ -85,8 +85,8 @@
 database_type='Gadfly'
 __doc__='''%s Database Connection

-$Id: DA.py,v 1.9 1999/11/03 18:56:32 sroberts Exp $''' % database_type
-__version__='$Revision: 1.9 $'[11:-2]
+$Id: DA.py,v 1.10 2000/05/04 13:32:06 shane Exp $''' % database_type
+__version__='$Revision: 1.10 $'[11:-2]

 from db import DB, manage_DataSources
 import sys, DABase, Globals
@@ -157,7 +157,7 @@ class Connection(DABase.Connection):
                    raise 'BadRequest', (
                        '<strong>Invalid connection string: </strong>'
                        '<CODE>%s</CODE><br>\n'
-                        '<!--\n%s\n%s\n>\n'
+                        '<!--\n%s\n%s\n-->\n'
                        % (s,t,v)), tb
            finally: tb=None
    

--- a/lib/python/Shared/DC/ZRDB/Connection.py
+++ b/lib/python/Shared/DC/ZRDB/Connection.py
@@ -85,8 +85,8 @@
 __doc__='''Generic Database Connection Support


-$Id: Connection.py,v 1.21 1999/12/29 15:05:34 petrilli Exp $'''
-__version__='$Revision: 1.21 $'[11:-2]
+$Id: Connection.py,v 1.22 2000/05/04 13:32:06 shane Exp $'''
+__version__='$Revision: 1.22 $'[11:-2]

 import Globals, OFS.SimpleItem, AccessControl.Role, Acquisition, sys
 from DateTime import DateTime
@@ -229,7 +229,7 @@ class Connection(
                t, v, tb = sys.exc_type, sys.exc_value, sys.exc_traceback
                raise 'BadRequest', (
                    '<strong>Invalid connection string: </strong><CODE>%s</CODE><br>\n'
-                    '<!--\n%s\n%s\n>\n'
+                    '<!--\n%s\n%s\n-->\n'
                    % (s,t,v)), tb
        finally: tb=None
        self._v_connected=DateTime()

--- a/lib/python/Shared/DC/xml/xmllib.py
+++ b/lib/python/Shared/DC/xml/xmllib.py
@@ -51,7 +51,7 @@ xmldecl = re.compile('<\?xml'+_S+
 procopen = re.compile(r'<\?(?P<proc>' + _Name + ')' + _opS)
 procclose = re.compile(_opS + r'\?>')
 commentopen = re.compile('<!--')
-commentclose = re.compile('>')
+commentclose = re.compile('-->')
 doubledash = re.compile('--')
 attrfind = re.compile(
    _S + '(?P<name>' + _Name + ')'

--- a/lib/python/webdav/xmltools.py
+++ b/lib/python/webdav/xmltools.py
@@ -89,7 +89,7 @@
   in favor of a standard xml package once some issues are
   worked out."""

-__version__='$Revision: 1.8 $'[11:-2]
+__version__='$Revision: 1.9 $'[11:-2]

 import sys, os, string
 import Shared.DC.xml.xmllib
@@ -354,7 +354,7 @@ class Comment(Node):
    def __init__(self, val):
        self.__value__=val
    def toxml(self):
-        return '<!--%s>' % self.__value__
+        return '<!--%s-->' % self.__value__