diff options
| author | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2020-02-19 05:55:41 -0500 |
|---|---|---|
| committer | Jeongik Cha <jeongik@google.com> | 2021-05-11 16:28:37 +0900 |
| commit | 1c25dd0eb54e8e5b3daff3154aa2c121a40754e6 (patch) | |
| tree | 222aa70b6e0169040ad70ef5d0ca764ca4a464f6 | |
| parent | dbec7ad4540f87733394953f89b89d3557dbf3cb (diff) | |
| download | ninja-1c25dd0eb54e8e5b3daff3154aa2c121a40754e6.tar.gz | |
browse.py: use html.escape for python3
fixes #1741
fixes #1736
Cherry-picked from
https://github.com/ninja-build/ninja/commit/4d744de3eed19af8c8c1094637a044747c297934
Test: ninja ... -t browse with python3
Bug: 187784045
Change-Id: Ic6bd8b6eb08f68058712acf325be88ebb69831c7
| -rwxr-xr-x | src/browse.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/browse.py b/src/browse.py index 1c9c39b..653cbe9 100755 --- a/src/browse.py +++ b/src/browse.py @@ -29,12 +29,15 @@ except ImportError: import BaseHTTPServer as httpserver import SocketServer as socketserver import argparse -import cgi import os import socket import subprocess import sys import webbrowser +if sys.version_info >= (3, 2): + from html import escape +else: + from cgi import escape try: from urllib.request import unquote except ImportError: @@ -62,7 +65,7 @@ def match_strip(line, prefix): return (True, line[len(prefix):]) def html_escape(text): - return cgi.escape(text, quote=True) + return escape(text, quote=True) def parse(text): lines = iter(text.split('\n')) |