Fix cgi tests to be compatible with behaviour of older Python versions

Author: jgraham

tools/wptserve/wptserve/cgi/cgi.py

@@ -89,7 +89,10 @@ def initlog(*allargs):
                   DeprecationWarning, stacklevel=2)
     if logfile and not logfp:
         try:
-            logfp = open(logfile, "a", encoding="locale")
+            kwargs = {}
+            if sys.version_info > (3, 9):
+                kwargs["encoding"] = "locale"
+            logfp = open(logfile, "a", **kwargs)
         except OSError:
             pass
     if not logfp:

tools/wptserve/wptserve/cgi/test_cgi.py

@@ -74,6 +74,7 @@ class HackedSysModule:
     # will completely confuse the test of the cgi module
     argv = []
     stdin = sys.stdin
+    version_info = sys.version_info
 
 cgi.sys = HackedSysModule()
 
@@ -153,6 +154,10 @@ def do_test(buf, method):
       })
     ]
 
+# The behaviour of urllib.parse.parse_qs with empty input changed in Python 3.11
+if sys.version_info < (3, 11):
+    parse_strict_test_cases[0] = ("", ValueError("bad query field: ''"))
+
 def norm(seq):
     return sorted(seq, key=repr)