[Zope3-checkins] CVS: Zope3/src/zope/documenttemplate - dt_html.py:1.4

[Chris McDonough]

Update of /cvs-repository/Zope3/src/zope/documenttemplate
In directory cvs.zope.org:/tmp/cvs-serv5558/src/zope/documenttemplate

Modified Files:
	dt_html.py 
Log Message:
Merge security policy refactoring:

 - Moved all role- and grant-related functionality into
   zope.products.securitypolicy (and out of zope.app.security.grant).
   The zope.products.securitypolicy implementation is exactly
   the same as the old implementation; no changes were made
   to the actual mechanics of role-permission or principal-permission
   grants.  The only real difference is that all functionality
   that is the purview of what we want a security policy to have
   control of is now in that one place.

 - Created new modulealias directive which can be used to provide
   aliases to older modules (to not break existing ZODBs when
   module locations change).

 - Added minor feature: "make debug" launches a debug session in the
   spirit of Zope 2's "zopectl debug".
   


=== Zope3/src/zope/documenttemplate/dt_html.py 1.3 => 1.4 ===
--- Zope3/src/zope/documenttemplate/dt_html.py:1.3	Thu May  1 15:35:40 2003
+++ Zope3/src/zope/documenttemplate/dt_html.py	Wed Jan 14 17:55:30 2004
@@ -192,13 +192,14 @@
                        (("<"), '&lt;' ),
                        ((">"), '&gt;' ),
                        (('"'), '&quot;'))): #"
-        if text is None: text=self.read_raw()
-        for re,name in character_entities:
-            if text.find(re) >= 0: text=name.join(text.split(re))
+        if text is None:
+            text=self.read_raw()
+        for re, name in character_entities:
+            if text.find(re) >= 0:
+                text = name.join(text.split(re))
         return text
 
-    errQuote__roles__=()
-    errQuote=quotedHTML
+    errQuote = quotedHTML
 
     def __str__(self):
         return self.quotedHTML()