Hopiu/linkchecker
1
0
Fork 0
mirror of https://github.com/Hopiu/linkchecker.git synced 2026-04-12 10:30:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make html.escape Python 3 only

Browse source
This commit is contained in:
Chris Mayo 2020-05-14 20:15:28 +01:00
parent 42de609f8e
commit bda9612273
5 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
linkcheck/checker/__init__.py
View file

@ -18,7 +18,7 @@ Main functions for link checking.
"""
import os
from html import escape as html_escape
import html
import urllib.parse
from .. import strformat, url as urlutil, log, LOG_CHECK
@ -163,9 +163,9 @@ def get_index_html (urls):
"""
lines = ["<html>", "<body>"]
for entry in urls:
name = html_escape(entry)
name = html.escape(entry)
try:
url = html_escape(urllib.parse.quote(entry))
url = html.escape(urllib.parse.quote(entry))
except KeyError:
# Some unicode entries raise KeyError.
url = name

4
linkcheck/lc_cgi.py
View file

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

24
linkcheck/logger/html.py
View file

@ -17,7 +17,7 @@
A HTML logger.
"""
from html import escape as html_escape
import html
import os
import time
@ -174,12 +174,12 @@ class HtmlLogger (_Logger):
self.writeln("<tr>")
self.writeln('<td class="url">%s</td>' % self.part("url"))
self.write('<td class="url">')
self.write("`%s'" % html_escape(url_data.base_url))
self.write("`%s'" % html.escape(url_data.base_url))
self.writeln("</td></tr>")
def write_name (self, url_data):
"""Write url_data.name."""
args = (self.part("name"), html_escape(url_data.name))
args = (self.part("name"), html.escape(url_data.name))
self.writeln("<tr><td>%s</td><td>`%s'</td></tr>" % args)
def write_parent (self, url_data):
@ -187,7 +187,7 @@ class HtmlLogger (_Logger):
self.write("<tr><td>"+self.part("parenturl")+
'</td><td><a target="top" href="'+
url_data.parent_url+'">'+
html_escape(url_data.parent_url)+"</a>")
html.escape(url_data.parent_url)+"</a>")
if url_data.line is not None:
self.write(_(", line %d") % url_data.line)
if url_data.column is not None:
@ -206,13 +206,13 @@ class HtmlLogger (_Logger):
def write_base (self, url_data):
"""Write url_data.base_ref."""
self.writeln("<tr><td>"+self.part("base")+"</td><td>"+
html_escape(url_data.base_ref)+"</td></tr>")
html.escape(url_data.base_ref)+"</td></tr>")
def write_real (self, url_data):
"""Write url_data.url."""
self.writeln("<tr><td>"+self.part("realurl")+"</td><td>"+
'<a target="top" href="'+url_data.url+
'">'+html_escape(url_data.url)+"</a></td></tr>")
'">'+html.escape(url_data.url)+"</a></td></tr>")
def write_dltime (self, url_data):
"""Write url_data.dltime."""
@ -234,20 +234,20 @@ class HtmlLogger (_Logger):
def write_info (self, url_data):
"""Write url_data.info."""
sep = "<br/>"+os.linesep
text = sep.join(html_escape(x) for x in url_data.info)
text = sep.join(html.escape(x) for x in url_data.info)
self.writeln('<tr><td valign="top">' + self.part("info")+
"</td><td>"+text+"</td></tr>")
def write_modified(self, url_data):
"""Write url_data.modified."""
text = html_escape(self.format_modified(url_data.modified))
text = html.escape(self.format_modified(url_data.modified))
self.writeln('<tr><td valign="top">' + self.part("modified") +
"</td><td>"+text+"</td></tr>")
def write_warning (self, url_data):
"""Write url_data.warnings."""
sep = "<br/>"+os.linesep
text = sep.join(html_escape(x[1]) for x in url_data.warnings)
text = sep.join(html.escape(x[1]) for x in url_data.warnings)
self.writeln('<tr><td class="warning" '+
'valign="top">' + self.part("warning") +
'</td><td class="warning">' + text + "</td></tr>")
@ -258,14 +258,14 @@ class HtmlLogger (_Logger):
self.write('<tr><td class="valid">')
self.write(self.part("result"))
self.write('</td><td class="valid">')
self.write(html_escape(_("Valid")))
self.write(html.escape(_("Valid")))
else:
self.write('<tr><td class="error">')
self.write(self.part("result"))
self.write('</td><td class="error">')
self.write(html_escape(_("Error")))
self.write(html.escape(_("Error")))
if url_data.result:
self.write(": "+html_escape(url_data.result))
self.write(": "+html.escape(url_data.result))
self.writeln("</td></tr>")
def write_stats (self):

4
scripts/analyze_memdump.py
View file

@ -20,7 +20,7 @@ Analyze a memory dump by the meliae module.
import sys
import os
import codecs
from html import escape as html_escape
import html
from linkcheck import strformat
def main (filename):
@ -107,7 +107,7 @@ def write_html_obj(fp, obj, objs):
if obj.value is None:
value = "None"
else:
value = html_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

@ -17,7 +17,7 @@
Define http test support classes for LinkChecker tests.
"""
from html import escape as html_escape
import html
from http.server import CGIHTTPRequestHandler, SimpleHTTPRequestHandler, HTTPServer
from http.client import HTTPConnection, HTTPSConnection
import os.path
@ -133,7 +133,7 @@ class NoQueryHttpRequestHandler (StoppableHttpRequestHandler):
displayname = linkname = name
list_item = (
'<li><a href="%s">%s</a>\n'
% (urllib.parse.quote(linkname), html_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")