mirror of https://github.com/python/cpython
Issue #22924: Scripts gprof2html.py and highlight.py now use html.escape()
instead of deperecated cgi.escape(). Original patch by Raymond Hettinger.
This commit is contained in:
parent
66323415c7
commit
7a1104d292
|
@ -2,7 +2,11 @@
|
|||
|
||||
"""Transform gprof(1) output into useful HTML."""
|
||||
|
||||
import re, os, sys, cgi, webbrowser
|
||||
import html
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
import webbrowser
|
||||
|
||||
header = """\
|
||||
<html>
|
||||
|
@ -22,7 +26,7 @@ trailer = """\
|
|||
def add_escapes(filename):
|
||||
with open(filename) as fp:
|
||||
for line in fp:
|
||||
yield cgi.escape(line)
|
||||
yield html.escape(line)
|
||||
|
||||
|
||||
def main():
|
||||
|
|
|
@ -3,11 +3,12 @@
|
|||
|
||||
__author__ = 'Raymond Hettinger'
|
||||
|
||||
import keyword, tokenize, cgi, re, functools
|
||||
try:
|
||||
import builtins
|
||||
except ImportError:
|
||||
import __builtin__ as builtins
|
||||
import functools
|
||||
import html as html_module
|
||||
import keyword
|
||||
import re
|
||||
import tokenize
|
||||
|
||||
#### Analyze Python Source #################################
|
||||
|
||||
|
@ -101,7 +102,7 @@ def html_highlight(classified_text,opener='<pre class="python">\n', closer='</pr
|
|||
for kind, text in classified_text:
|
||||
if kind:
|
||||
result.append('<span class="%s">' % kind)
|
||||
result.append(cgi.escape(text))
|
||||
result.append(html_module.escape(text))
|
||||
if kind:
|
||||
result.append('</span>')
|
||||
result.append(closer)
|
||||
|
@ -140,7 +141,7 @@ def build_html_page(classified_text, title='python',
|
|||
'Create a complete HTML page with colorized source code'
|
||||
css_str = '\n'.join(['%s %s' % item for item in css.items()])
|
||||
result = html_highlight(classified_text)
|
||||
title = cgi.escape(title)
|
||||
title = html_module.escape(title)
|
||||
return html.format(title=title, css=css_str, body=result)
|
||||
|
||||
#### LaTeX Output ##########################################
|
||||
|
@ -193,7 +194,11 @@ def latex_highlight(classified_text, title = 'python',
|
|||
|
||||
|
||||
if __name__ == '__main__':
|
||||
import sys, argparse, webbrowser, os, textwrap
|
||||
import argparse
|
||||
import os.path
|
||||
import sys
|
||||
import textwrap
|
||||
import webbrowser
|
||||
|
||||
parser = argparse.ArgumentParser(
|
||||
description = 'Add syntax highlighting to Python source code',
|
||||
|
|
Loading…
Reference in New Issue