# HG changeset patch # User Oleksandr Gavenko # Date 1630481910 -10800 # Node ID 679972640f47edad9a22a0790aa1d324efc95690 # Parent 24f8a621bfdd49b7c18e01368501c04886565ede Fixed another portion of incompatibilities with Python 2 (for "make html"). diff -r 24f8a621bfdd -r 679972640f47 py/gadialog_html.py --- a/py/gadialog_html.py Wed Sep 01 10:13:16 2021 +0300 +++ b/py/gadialog_html.py Wed Sep 01 10:38:30 2021 +0300 @@ -4,7 +4,7 @@ import io import sys import codecs -import html +from xml.sax.saxutils import escape import gadialog @@ -43,7 +43,7 @@ ################################################################ -HTML_HEADER = """ +HTML_HEADER = u""" @@ -64,7 +64,7 @@ """ -NAME = html.escape("Dialogs") +NAME = escape("Dialogs") FOUT.write(HTML_HEADER.format(title=NAME)) FOUT.write("

{} dictionary

\n".format(NAME)) @@ -74,7 +74,7 @@ FOUT.write("") diff -r 24f8a621bfdd -r 679972640f47 py/gadict_html.py --- a/py/gadict_html.py Wed Sep 01 10:13:16 2021 +0300 +++ b/py/gadict_html.py Wed Sep 01 10:38:30 2021 +0300 @@ -5,7 +5,7 @@ import sys import codecs import re -import html +from xml.sax.saxutils import escape import gadict import gadict_freq @@ -67,7 +67,7 @@ try: DOM = PARSER.parse(FIN) except gadict.ParseException as ex: - sys.stdout.write("{:s}{:s}\n".format(FINAME, repr(ex))) + sys.stdout.write(u"{:s}{:s}\n".format(FINAME, repr(ex))) if __debug__: import traceback traceback.print_exc() @@ -111,36 +111,36 @@ """ FOUT.write(HTML_HEADER.format(title=PRELUDE.name)) -FOUT.write("

{} dictionary

\n".format(html.escape(PRELUDE.name))) +FOUT.write(u"

{} dictionary

\n".format(escape(PRELUDE.name))) # FOUT.write("Home page") # FOUT.write(" , ".join(PRELUDE.urls)) FOUT.write("

License: ") -FOUT.write(html.escape(", ".join(PRELUDE.licences))) +FOUT.write(escape(", ".join(PRELUDE.licences))) # FOUT.write("

\n

") -# FOUT.write(html.escape(PRELUDE.about)) +# FOUT.write(escape(PRELUDE.about)) FOUT.write("

\n") def link(lst): buf = [] for el in lst: - el = html.escape(el) - lnk = "{}".format(el, el) + el = escape(el) + lnk = u"{}".format(el, el) buf.append(lnk) return "; ".join(buf) for (headwords, translations) in DOM[1:]: identity = headwords[0].headword - FOUT.write("
\n".format(html.escape(identity))) + FOUT.write(u"
\n".format(escape(identity))) for hw in headwords: FOUT.write("
") - FOUT.write("{}".format(html.escape(hw.headword))) + FOUT.write(u"{}".format(escape(hw.headword))) if hw.pron is not None: FOUT.write(" [") - FOUT.write(html.escape(hw.pron)) + FOUT.write(escape(hw.pron)) FOUT.write("]") if len(hw.attrs) > 0: FOUT.write(" ") - l = ["«"+x+"»" for x in hw.attrs] + l = [u"«" + x + u"»" for x in hw.attrs] l.sort() FOUT.write(", ".join(l)) FOUT.write("") @@ -154,13 +154,13 @@ raise Exception("""Empty sense for article: """ + headwords.__iter__().__next__()) FOUT.write("
") if sense.pos: - FOUT.write("«") - FOUT.write(html.escape(sense.pos)) - FOUT.write("» ") + FOUT.write(u"«") + FOUT.write(escape(sense.pos)) + FOUT.write(u"» ") need_sep = False if sense.topic_list and len(sense.topic_list) > 0: FOUT.write("") - FOUT.write(html.escape(", ".join(sense.topic_list))) + FOUT.write(escape(", ".join(sense.topic_list))) FOUT.write("") need_sep = True if sense.ant_list and len(sense.ant_list) > 0: @@ -192,24 +192,24 @@ continue FOUT.write("
") if not LANGS or len(LANGS) > 1: - FOUT.write("{} ".format(html.escape(lang))) - FOUT.write("{}".format(html.escape(tr))) + FOUT.write(u"{} ".format(escape(lang))) + FOUT.write(u"{}".format(escape(tr))) FOUT.write("
") for (lang, tr) in sense.glos_list or []: if LANGS and lang not in LANGS: continue FOUT.write("
") if not LANGS or len(LANGS) > 1: - FOUT.write("{} ".format(html.escape(lang))) - FOUT.write("{}".format(html.escape(tr))) + FOUT.write(u"{} ".format(escape(lang))) + FOUT.write(u"{}".format(escape(tr))) FOUT.write("
") for (lang, tr) in sense.ex_list or []: if LANGS and lang not in LANGS: continue FOUT.write("
") if not LANGS or len(LANGS) > 1: - FOUT.write("{} ".format(html.escape(lang))) - FOUT.write("{}".format(html.escape(tr))) + FOUT.write(u"{} ".format(escape(lang))) + FOUT.write(u"{}".format(escape(tr))) FOUT.write("
") FOUT.write("
") freqtags = [] @@ -218,7 +218,7 @@ freqtags.append(freqtag) if len(freqtags) > 0: FOUT.write("

") - FOUT.write(html.escape(",".join(freqtags))) + FOUT.write(escape(",".join(freqtags))) FOUT.write("

") FOUT.write("
")