svn commit: r1038340 - /subversion/trunk/tools/dist/collect_sigs.py

[hw...@apache.org]

Author: hwright
Date: Tue Nov 23 20:54:08 2010
New Revision: 1038340

URL: http://svn.apache.org/viewvc?rev=1038340&view=rev
Log:
Always include the signature area in the generated page, allowing folks to
paste multiple signatures consecutively, instead of having to use the 'Back'
button on their browser.

* tools/dist/collect_sigs.py
  (default_page): Remove.
  (signature_area): New.
  (process_sigs): Append the signature area to the resulting html.
  (main): Use a string, instead of a callable which just returned a string.

Modified:
    subversion/trunk/tools/dist/collect_sigs.py

Modified: subversion/trunk/tools/dist/collect_sigs.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/collect_sigs.py?rev=1038340&r1=1038339&r2=1038340&view=diff
==============================================================================
--- subversion/trunk/tools/dist/collect_sigs.py (original)
+++ subversion/trunk/tools/dist/collect_sigs.py Tue Nov 23 20:54:08 2010
@@ -110,8 +110,7 @@ $content
 </html>
 '''
 
-def default_page():
-  c = '''
+signature_area = '''
 <form method="post">
 <p>Paste signatures in the area below:<br/>
 <textarea name="signatures" rows="20" cols="80"></textarea>
@@ -122,8 +121,6 @@ and <tt>END PGP SIGNATURE</tt> lines wil
 </form>
 '''
 
-  return c
-
 
 def split(sigs):
   lines = []
@@ -236,7 +233,7 @@ def process_sigs(signatures):
     else:
       retval += c_unverified % (signature, result)
 
-  return retval
+  return retval + signature_area
 
 
 def main():
@@ -245,7 +242,7 @@ def main():
 
   form = cgi.FieldStorage()
   if 'signatures' not in form:
-    content = default_page()
+    content = signature_area
   else:
     content = process_sigs(form['signatures'].value)