fix typos in escape() and print_form()

diff --git a/Lib/cgi.py b/Lib/cgi.py
index a9599a73b6e3b37242118de4091ae29d8254039b..3862cb548bcbb2e42fec7f526b960ce7924aaf6a 100755 (executable)
--- a/Lib/cgi.py
+++ b/Lib/cgi.py
@@ -258,13 +258,13 @@ def print_form( form ):
        for key in skeys:
                print '<dt>', escape(key), ':',
                print '<i>', escape(`type(form[key])`), '</i>',
-               print '<dd>', escape(form[key])
+               print '<dd>', escape(`form[key]`)
        print '</dl>'
 
 def escape( s ):
-       s = regsub.gsub('&', '&amp;') # Must be done first
-       s = regsub.gsub('<', '&lt;')
-       s = regsub.gsub('>', '&gt;')
+       s = regsub.gsub('&', '&amp;', s) # Must be done first
+       s = regsub.gsub('<', '&lt;', s)
+       s = regsub.gsub('>', '&gt;', s)
        return s
 
 def test( what ):