Gitweb links:
...log
http://git.netsurf-browser.org/netsurf-test.git/shortlog/ab72029ee2894eba9ac454ec916442a0099fa46f
...commit
http://git.netsurf-browser.org/netsurf-test.git/commit/ab72029ee2894eba9ac454ec916442a0099fa46f
...tree
http://git.netsurf-browser.org/netsurf-test.git/tree/ab72029ee2894eba9ac454ec916442a0099fa46f
The branch, master has been updated
via ab72029ee2894eba9ac454ec916442a0099fa46f (commit)
from e271bc41b3a8820d57b4d1fec95495a194d30849 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf-test.git/commit/?id=ab72029ee2894eba9ac454ec916442a0099fa46f
commit ab72029ee2894eba9ac454ec916442a0099fa46f
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
Update cgi to work with python 3.11
diff --git a/cgi-bin/and-then-js.cgi b/cgi-bin/and-then-js.cgi
index 6c03589..dc26ed3 100755
--- a/cgi-bin/and-then-js.cgi
+++ b/cgi-bin/and-then-js.cgi
@@ -1,5 +1,6 @@
#!/usr/bin/python3
+from urllib.parse import parse_qs
import cgi
import cgitb
import os
@@ -7,7 +8,7 @@ import time
cgitb.enable()
-qs = cgi.parse_qs(os.getenv("QUERY_STRING", "t=1&val=async-cb-adds-timeout"))
+qs = parse_qs(os.getenv("QUERY_STRING", "t=1&val=async-cb-adds-timeout"))
content = qs.get("val", ["async-cb-adds-timeout"])[0]
diff --git a/cgi-bin/cookies.cgi b/cgi-bin/cookies.cgi
index be12589..96d9d25 100755
--- a/cgi-bin/cookies.cgi
+++ b/cgi-bin/cookies.cgi
@@ -1,13 +1,10 @@
#!/usr/bin/python3
-import cgi
-import cgitb
import os
import sys
import io
import json
-
-cgitb.enable()
+from html import escape as html_escape
print("Content-Type: text/html")
print("")
@@ -28,7 +25,7 @@ print("""
""")
for k, v in cookies.items():
- print(" <li>{}: {}</li>".format(cgi.escape(k), cgi.escape(v)))
+ print(" <li>{}: {}</li>".format(html_escape(k), html_escape(v)))
print("""
</ul>
<hr />
diff --git a/cgi-bin/env.cgi b/cgi-bin/env.cgi
index ffd6785..dc02349 100755
--- a/cgi-bin/env.cgi
+++ b/cgi-bin/env.cgi
@@ -1,5 +1,6 @@
#!/usr/bin/python3
+from urllib.parse import parse_qs
import cgi
import cgitb
import os
@@ -33,7 +34,7 @@ for k in sorted(os.environ.keys()):
print("ENV:{}:{}".format(k, os.environ[k]))
if "QUERY_STRING" in os.environ:
- qs = cgi.parse_qs(os.getenv("QUERY_STRING"))
+ qs = parse_qs(os.getenv("QUERY_STRING"))
for k, vs in qs.items():
for i, v in enumerate(vs):
if len(vs) > 1:
diff --git a/cgi-bin/image.cgi b/cgi-bin/image.cgi
index edcca1e..429851e 100755
--- a/cgi-bin/image.cgi
+++ b/cgi-bin/image.cgi
@@ -1,17 +1,14 @@
#!/usr/bin/python3
-import cgi
-import cgitb
+from urllib.parse import parse_qs
import sys
-cgitb.enable()
-
import os
from io import BytesIO
auth = os.getenv("HTTP_AUTHORIZATION")
query = os.getenv("QUERY_STRING") or ""
-query = cgi.parse_qs(query)
+query = parse_qs(query)
width = query.get("width", ["100"])[0]
height = query.get("height", ["100"])[0]
diff --git a/cgi-bin/sleep.cgi b/cgi-bin/sleep.cgi
index 87c017c..270d3bc 100755
--- a/cgi-bin/sleep.cgi
+++ b/cgi-bin/sleep.cgi
@@ -1,13 +1,10 @@
#!/usr/bin/python3
-import cgi
-import cgitb
+from urllib.parse import parse_qs
import os
import time
-cgitb.enable()
-
-qs = cgi.parse_qs(os.getenv("QUERY_STRING", "t=10&ct=text/javascript"))
+qs = parse_qs(os.getenv("QUERY_STRING", "t=10&ct=text/javascript"))
content_type = qs.get("ct", ["text/javascript"])[0]
-----------------------------------------------------------------------
Summary of changes:
cgi-bin/and-then-js.cgi | 3 ++-
cgi-bin/cookies.cgi | 7 ++-----
cgi-bin/env.cgi | 3 ++-
cgi-bin/image.cgi | 7 ++-----
cgi-bin/sleep.cgi | 7 ++-----
5 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/cgi-bin/and-then-js.cgi b/cgi-bin/and-then-js.cgi
index 6c03589..dc26ed3 100755
--- a/cgi-bin/and-then-js.cgi
+++ b/cgi-bin/and-then-js.cgi
@@ -1,5 +1,6 @@
#!/usr/bin/python3
+from urllib.parse import parse_qs
import cgi
import cgitb
import os
@@ -7,7 +8,7 @@ import time
cgitb.enable()
-qs = cgi.parse_qs(os.getenv("QUERY_STRING", "t=1&val=async-cb-adds-timeout"))
+qs = parse_qs(os.getenv("QUERY_STRING", "t=1&val=async-cb-adds-timeout"))
content = qs.get("val", ["async-cb-adds-timeout"])[0]
diff --git a/cgi-bin/cookies.cgi b/cgi-bin/cookies.cgi
index be12589..96d9d25 100755
--- a/cgi-bin/cookies.cgi
+++ b/cgi-bin/cookies.cgi
@@ -1,13 +1,10 @@
#!/usr/bin/python3
-import cgi
-import cgitb
import os
import sys
import io
import json
-
-cgitb.enable()
+from html import escape as html_escape
print("Content-Type: text/html")
print("")
@@ -28,7 +25,7 @@ print("""
""")
for k, v in cookies.items():
- print(" <li>{}: {}</li>".format(cgi.escape(k), cgi.escape(v)))
+ print(" <li>{}: {}</li>".format(html_escape(k), html_escape(v)))
print("""
</ul>
<hr />
diff --git a/cgi-bin/env.cgi b/cgi-bin/env.cgi
index ffd6785..dc02349 100755
--- a/cgi-bin/env.cgi
+++ b/cgi-bin/env.cgi
@@ -1,5 +1,6 @@
#!/usr/bin/python3
+from urllib.parse import parse_qs
import cgi
import cgitb
import os
@@ -33,7 +34,7 @@ for k in sorted(os.environ.keys()):
print("ENV:{}:{}".format(k, os.environ[k]))
if "QUERY_STRING" in os.environ:
- qs = cgi.parse_qs(os.getenv("QUERY_STRING"))
+ qs = parse_qs(os.getenv("QUERY_STRING"))
for k, vs in qs.items():
for i, v in enumerate(vs):
if len(vs) > 1:
diff --git a/cgi-bin/image.cgi b/cgi-bin/image.cgi
index edcca1e..429851e 100755
--- a/cgi-bin/image.cgi
+++ b/cgi-bin/image.cgi
@@ -1,17 +1,14 @@
#!/usr/bin/python3
-import cgi
-import cgitb
+from urllib.parse import parse_qs
import sys
-cgitb.enable()
-
import os
from io import BytesIO
auth = os.getenv("HTTP_AUTHORIZATION")
query = os.getenv("QUERY_STRING") or ""
-query = cgi.parse_qs(query)
+query = parse_qs(query)
width = query.get("width", ["100"])[0]
height = query.get("height", ["100"])[0]
diff --git a/cgi-bin/sleep.cgi b/cgi-bin/sleep.cgi
index 87c017c..270d3bc 100755
--- a/cgi-bin/sleep.cgi
+++ b/cgi-bin/sleep.cgi
@@ -1,13 +1,10 @@
#!/usr/bin/python3
-import cgi
-import cgitb
+from urllib.parse import parse_qs
import os
import time
-cgitb.enable()
-
-qs = cgi.parse_qs(os.getenv("QUERY_STRING", "t=10&ct=text/javascript"))
+qs = parse_qs(os.getenv("QUERY_STRING", "t=10&ct=text/javascript"))
content_type = qs.get("ct", ["text/javascript"])[0]
--
NetSurf test cases
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
