operation.py: Refactor `polswitch' a little.

[chopwood] / cgi.py

diff --git a/cgi.py b/cgi.py
index 0bd66cc5ff642049b378cec4f3e41d6ff80202ba..3b3d4417e1849d932beb37dd333b5deb808d41ff 100644 (file)
--- a/cgi.py
+++ b/cgi.py
@@ -59,7 +59,7 @@ CONF.DEFAULTS.update(
 ## Some handy regular expressions.
 R_URLESC = RX.compile('%([0-9a-fA-F]{2})')
 R_URLBAD = RX.compile('[^-\\w,.!]')
 ## Some handy regular expressions.
 R_URLESC = RX.compile('%([0-9a-fA-F]{2})')
 R_URLBAD = RX.compile('[^-\\w,.!]')

-R_HTMLBAD = RX.compile('[&<>]')
+R_HTMLBAD = RX.compile('[&<>\'"]')

 
 def urldecode(s):
   """Decode a single form-url-encoded string S."""
 
 def urldecode(s):
   """Decode a single form-url-encoded string S."""


@@ -77,17 +77,18 @@ def htmlescape(s):
 
 ## Some standard character sequences, and HTML entity names for prettier
 ## versions.
 
 ## Some standard character sequences, and HTML entity names for prettier
 ## versions.

-_quotify = U.StringSubst({
+html_quotify = U.StringSubst({
+  "<": '&lt;',
+  ">": '&gt;',
+  "&": '&amp;',

   "`": '&lsquo;',
   "'": '&rsquo;',
   "`": '&lsquo;',
   "'": '&rsquo;',

+  '"': '&quot;',

   "``": '&ldquo;',
   "''": '&rdquo;',
   "--": '&ndash;',
   "---": '&mdash;'
 })
   "``": '&ldquo;',
   "''": '&rdquo;',
   "--": '&ndash;',
   "---": '&mdash;'
 })

-def html_quotify(s):
-  """Return a pretty HTML version of S."""
-  return _quotify(htmlescape(s))

 
 ###--------------------------------------------------------------------------
 ### Output machinery.
 
 ###--------------------------------------------------------------------------
 ### Output machinery.


@@ -229,7 +230,7 @@ class FormatHTML (F.SimpleFormatOperation):
   """
   ~H: escape output suitable for inclusion in HTML.
 
   """
   ~H: escape output suitable for inclusion in HTML.
 

-  With `:', instead apply form-urlencoding.
+  With `:', additionally apply quotification.

   """
   def _convert(me, arg):
     if me.colonp: return html_quotify(arg)
   """
   def _convert(me, arg):
     if me.colonp: return html_quotify(arg)