gemini.git

going-flying.com gemini git repository

summary

tree

log

refs

91c962ffa6cf966d2a2c170a70fae50ef1b92991 - Matthew Ernisse - 1614716921

cleanup

view tree

view raw

diff --git a/cgi-bin/test b/cgi-bin/test
index 79b1300..e4098cf 100755
--- a/cgi-bin/test
+++ b/cgi-bin/test
@@ -8,8 +8,8 @@ from gmicgi import GeminiCGI
 
 cgi = GeminiCGI()
 
+HEADER='# Molly Brown / gmicgi test suite'
 MAIN_PAGE='''
-# Molly Brown / gmicgi test suite
 
 => /cgi-bin/test/certificate
 => /cgi-bin/test/input
@@ -21,6 +21,7 @@ MAIN_PAGE='''
 def default():
 	''' This should be the default route.'''
 	cgi.Response.Ok('text/gemini')
+	print(HEADER)
 	print(MAIN_PAGE)
 	print_cgi_environ()
 
@@ -30,6 +31,7 @@ def default():
 def certificate():
 	''' Require a certificate.'''
 	cgi.Response.Ok('text/gemini')
+	print(HEADER)
 	print_cgi_environ()
 
 
@@ -38,36 +40,35 @@ def certificate():
 def input():
 	''' Require Input.'''
 	cgi.Response.Ok('text/gemini')
+	print(HEADER)
 	print_cgi_environ()
 
 
 def print_cgi_environ():
-	print('''
-
+	PAGE='''
 ## Below enumerates the environment passed by the server to the script.
 
 ```
-''')
-	for k, v in os.environ.items():
-		print(f'{k}={v}')
+{}
+```
 
-	print()
-	print('''
 ## This is the state of the gmicgi object
-```
-''')
 
-	pprint.pprint(vars(cgi))
-	print('''
 ```
+{}
+```
+
 ## And below here are any parameters passed to the script itself.
 
 ```
-''')
+{}
+```
+'''
+	cgivars = pprint.pformat(vars(cgi))
+	environ = '\n'.join([f'{k}={v}' for k,v in os.environ.items()])
+
+	print(PAGE.format(environ, cgivars, sys.argv[1:]))
 
-	print(sys.argv[1:])
-	print()
-	print('```')
 
 if __name__ == '__main__':
 	cgi.run()