[Zope-Checkins] CVS: Zope/lib/python/ZClasses - Method.py:1.26

[Tres Seaver]

Update of /cvs-repository/Zope/lib/python/ZClasses
In directory cvs.zope.org:/tmp/cvs-serv19785/lib/python/ZClasses

Modified Files:
	Method.py 
Log Message:


  - Merge CGI-escape templating changes from 2.6 / 2.7 audit work.


=== Zope/lib/python/ZClasses/Method.py 1.25 => 1.26 ===
--- Zope/lib/python/ZClasses/Method.py:1.25	Tue Nov 18 08:17:15 2003
+++ Zope/lib/python/ZClasses/Method.py	Thu Jan 15 17:44:10 2004
@@ -25,6 +25,7 @@
 from zExceptions import BadRequest
 
 import marshal
+from cgi import escape
 
 _marker=[]
 class ZClassMethodsSheet(
@@ -107,11 +108,11 @@
     def _checkId(self, id, allow_dup=0,
                  _reserved=('propertysheets','manage_workspace')):
         if id in _reserved:
-            raise BadRequest, 'The id, %s, is reseverd' % id
+            raise BadRequest, 'The id, %s, is reserved' % escape(id)
 
         if not allow_dup and self.getClassAttr(id, self) is not self:
             raise BadRequest, (
-                'The id %s is invalid - it is already in use.' % id)
+                'The id %s is invalid - it is already in use.' % escape(id))
 
         ZClassMethodsSheet.inheritedAttribute('_checkId')(
             self, id, 1)