Hopiu/linkchecker
1
0
Fork 0
mirror of https://github.com/Hopiu/linkchecker.git synced 2026-03-16 22:10:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace deprecated cgi.escape

Browse source 
html provided for Python 2 by future
https://python-future.org/compatible_idioms.html#html-escaping-and-entities
This commit is contained in:
Chris Mayo 2019-09-17 20:25:05 +01:00
parent 1590408a65
commit 53cd9475b5
5 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
linkcheck/checker/__init__.py
View file

@ -19,7 +19,7 @@ Main functions for link checking.
"""
import os
import cgi
from html import escape as html_escape
try: # Python 3
from urllib import parse as urlparse
except ImportError:
@ -166,9 +166,9 @@ def get_index_html (urls):
"""
lines = ["<html>", "<body>"]
for entry in urls:
name = cgi.escape(entry)
name = html_escape(entry)
try:
url = cgi.escape(urlparse.quote(entry))
url = html_escape(urlparse.quote(entry))
except KeyError:
# Some unicode entries raise KeyError.
url = name

4
linkcheck/lc_cgi.py
View file

@ -18,7 +18,7 @@
Functions used by the WSGI script.
"""
import cgi
from html import escape as html_escape
import os
import threading
import locale
@ -265,4 +265,4 @@ contains only these characters: <code>A-Za-z0-9./_~-</code><br/><br/>
Errors are logged.
</blockquote>
</body>
</html>""") % cgi.escape(why)
</html>""") % html_escape(why)

30
linkcheck/logger/html.py
View file

@ -17,9 +17,13 @@
"""
A HTML logger.
"""
import time
import cgi
from __future__ import absolute_import
from html import escape as html_escape
import os
import time
from . import _Logger
from .. import strformat, configuration
@ -173,12 +177,12 @@ class HtmlLogger (_Logger):
self.writeln(u"<tr>")
self.writeln(u'<td class="url">%s</td>' % self.part("url"))
self.write(u'<td class="url">')
self.write(u"`%s'" % cgi.escape(url_data.base_url))
self.write(u"`%s'" % html_escape(url_data.base_url))
self.writeln(u"</td></tr>")
def write_name (self, url_data):
"""Write url_data.name."""
args = (self.part("name"), cgi.escape(url_data.name))
args = (self.part("name"), html_escape(url_data.name))
self.writeln(u"<tr><td>%s</td><td>`%s'</td></tr>" % args)
def write_parent (self, url_data):
@ -186,7 +190,7 @@ class HtmlLogger (_Logger):
self.write(u"<tr><td>"+self.part("parenturl")+
u'</td><td><a target="top" href="'+
url_data.parent_url+u'">'+
cgi.escape(url_data.parent_url)+u"</a>")
html_escape(url_data.parent_url)+u"</a>")
if url_data.line > 0:
self.write(_(", line %d") % url_data.line)
if url_data.column > 0:
@ -205,13 +209,13 @@ class HtmlLogger (_Logger):
def write_base (self, url_data):
"""Write url_data.base_ref."""
self.writeln(u"<tr><td>"+self.part("base")+u"</td><td>"+
cgi.escape(url_data.base_ref)+u"</td></tr>")
html_escape(url_data.base_ref)+u"</td></tr>")
def write_real (self, url_data):
"""Write url_data.url."""
self.writeln("<tr><td>"+self.part("realurl")+u"</td><td>"+
u'<a target="top" href="'+url_data.url+
u'">'+cgi.escape(url_data.url)+u"</a></td></tr>")
u'">'+html_escape(url_data.url)+u"</a></td></tr>")
def write_dltime (self, url_data):
"""Write url_data.dltime."""
@ -233,20 +237,20 @@ class HtmlLogger (_Logger):
def write_info (self, url_data):
"""Write url_data.info."""
sep = u"<br/>"+os.linesep
text = sep.join(cgi.escape(x) for x in url_data.info)
text = sep.join(html_escape(x) for x in url_data.info)
self.writeln(u'<tr><td valign="top">' + self.part("info")+
u"</td><td>"+text+u"</td></tr>")
def write_modified(self, url_data):
"""Write url_data.modified."""
text = cgi.escape(self.format_modified(url_data.modified))
text = html_escape(self.format_modified(url_data.modified))
self.writeln(u'<tr><td valign="top">' + self.part("modified") +
u"</td><td>"+text+u"</td></tr>")
def write_warning (self, url_data):
"""Write url_data.warnings."""
sep = u"<br/>"+os.linesep
text = sep.join(cgi.escape(x[1]) for x in url_data.warnings)
text = sep.join(html_escape(x[1]) for x in url_data.warnings)
self.writeln(u'<tr><td class="warning" '+
u'valign="top">' + self.part("warning") +
u'</td><td class="warning">' + text + u"</td></tr>")
@ -257,14 +261,14 @@ class HtmlLogger (_Logger):
self.write(u'<tr><td class="valid">')
self.write(self.part("result"))
self.write(u'</td><td class="valid">')
self.write(cgi.escape(_("Valid")))
self.write(html_escape(_("Valid")))
else:
self.write(u'<tr><td class="error">')
self.write(self.part("result"))
self.write(u'</td><td class="error">')
self.write(cgi.escape(_("Error")))
self.write(html_escape(_("Error")))
if url_data.result:
self.write(u": "+cgi.escape(url_data.result))
self.write(u": "+html_escape(url_data.result))
self.writeln(u"</td></tr>")
def write_stats (self):

4
scripts/analyze_memdump.py
View file

@ -21,7 +21,7 @@ Analyze a memory dump by the meliae module.
import sys
import os
import codecs
import cgi
from html import escape as html_escape
from linkcheck import strformat
def main (filename):
@ -108,7 +108,7 @@ def write_html_obj(fp, obj, objs):
if obj.value is None:
value = u"None"
else:
value = cgi.escape(str(obj.value))
value = html_escape(str(obj.value))
attrs = dict(
address=obj.address,
size=strformat.strsize(obj.size),

4
tests/checker/httpserver.py
View file

@ -18,11 +18,11 @@
Define http test support classes for LinkChecker tests.
"""
from html import escape as html_escape
from http.server import SimpleHTTPRequestHandler, HTTPServer
from http.client import HTTPConnection
import time
import threading
import cgi
try:
from urllib import parse as urllib_parse
except ImportError:
@ -134,7 +134,7 @@ class NoQueryHttpRequestHandler (StoppableHttpRequestHandler):
displayname = linkname = name
list_item = (
u'<li><a href="%s">%s</a>\n'
% (urllib_parse.quote(linkname), cgi.escape(displayname))
% (urllib_parse.quote(linkname), html_escape(displayname))
)
f.write(list_item.encode())
f.write(b"</ul>\n<hr>\n</body>\n</html>\n")