commit 8fecdfc473d067f9caa79dffa7ab078d391d50ed
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Fri Oct 13 10:04:27 2017 +0200

    Fix literal string in binary context
    
    In 1a26f9b26cff827da5, all strings in the context of regexes and
    comparisons have been converted to byte-like objects for python2/3
    compatibility reasons. This has not been considered in the later
    commit 5c545573507bb, which makes layout2layout break with
    TypeError: can't concat str to bytes.
---
 lib/scripts/layout2layout.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/scripts/layout2layout.py b/lib/scripts/layout2layout.py
index eebacf8..77cafa0 100644
--- a/lib/scripts/layout2layout.py
+++ b/lib/scripts/layout2layout.py
@@ -471,7 +471,7 @@ def convert(lines, end_format):
               re_trimEndLabelString, re_trimLabelCounter):
                 m = r.match(lines[i])
                 if m:
-                    lines[i] = m.group(1) + '"' + m.group(2) + '"'
+                    lines[i] = m.group(1) + b'"' + m.group(2) + b'"'
             i += 1
             continue
 

Reply via email to