On Monday, 3 January 2022 19.30.58 WET José Matos wrote:
> commit 940d3ceeb9e6d8ce216afedf18c898ec075cc27d
> Author: José Matos <jama...@lyx.org>
> Date: Mon Jan 3 19:59:42 2022 +0000
>
> Make layout2layout compatible with Python 2 and 3
> ---
> lib/scripts/layout2layout.py | 14 +++++++-------
> 1 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/lib/scripts/layout2layout.py b/lib/scripts/layout2layout.py
> index 7e40bfb..88ada12 100644
> --- a/lib/scripts/layout2layout.py
> +++ b/lib/scripts/layout2layout.py
> @@ -256,7 +256,7 @@ currentFormat = 95
> # New textclass tag BibInToc
>
> # Incremented to format 77, 6 August 2019 by spitz
> -# New textclass tag PageSize (= default page size)
> +# New textclass tag PageSize (= default page size)
> # and textclass option PageSize (= list of available page sizes)
>
> # Incremented to format 78, 6 August 2019 by spitz
> @@ -354,7 +354,7 @@ def error(message):
>
> def trim_bom(line):
> " Remove byte order mark."
> - if line[0:3] == "\357\273\277":
> + if line[0:3] == b"\357\273\277":
> return line[3:]
> else:
> return line
> @@ -444,8 +444,8 @@ def convert(lines, end_format):
> # for categories
> re_Declaration = re.compile(b'^#\\s*\\Declare\\w+Class.*$')
> re_ExtractCategory =
> re.compile(b'^(#\\s*\\Declare\\w+Class(?:\\[[^]]*?\\])?){([^(]+?)\\s+\\
(([^)]
> +?)\\)\\s*}\\s*$') - ConvDict = {"article": "Articles", "book" : "Books",
> "letter" : "Letters", "report": "Reports", - "presentation" :
> "Presentations", "curriculum vitae" : "Curricula Vitae", "handout" :
> "Handouts"} + ConvDict = {b"article": b"Articles", b"book": b"Books",
> b"letter": b"Letters", b"report": b"Reports", +
> b"presentation": b"Presentations", b"curriculum vitae": b"Curricula Vitae",
> b"handout": b"Handouts"} # Arguments
> re_OptArgs = re.compile(b'^(\\s*)OptionalArgs(\\s+)(\\d+)\\D*$',
> re.IGNORECASE) re_ReqArgs =
> re.compile(b'^(\\s*)RequiredArgs(\\s+)(\\d+)\\D*$', re.IGNORECASE) @@ -615,7
> +615,7 @@ def convert(lines, end_format):
> continue
> col = match.group(2)
> if col == "collapsable":
> - lines[i] = match.group(1) + "collapsible"
> + lines[i] = match.group(1) + b"collapsible"
> i += 1
> continue
>
> @@ -833,7 +833,7 @@ def convert(lines, end_format):
> # Insert the required number of arguments at the end of the
style
> definition match = re_End.match(lines[i])
> if match:
> - newarg = ['']
> + newarg = [b'']
> # First the optionals (this is the required order pre 2.1)
> if opts > 0:
> if opts == 1:
> @@ -1283,7 +1283,7 @@ def convert(lines, end_format):
> if latextype == b"item_environment" and label.lower() ==
> b"counter_enumi": lines[labeltype_line] =
> re_LabelType.sub(b'\\1\\2\\3Enumerate', lines[labeltype_line]) # Don't add
> the LabelCounter line later
> - counter = ""
> + counter = b""
>
> # Replace
> #
This is a candidate to 2.3.x.
FWIW I have backported it in order to fix:
https://bugzilla.redhat.com/show_bug.cgi?id=1965118
--
José Abílio
--
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel
