From bf1ae4a36bef5268ce335528e58149e016e6c3e4 Mon Sep 17 00:00:00 2001 From: STEPHANVS Date: Sun, 4 Jul 2021 18:33:18 +0200 Subject: [PATCH] Even more test fixes --- openlp/core/display/render.py | 8 ++++---- tests/openlp_core/display/test_render.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openlp/core/display/render.py b/openlp/core/display/render.py index 75a7233f5..551bce5ef 100644 --- a/openlp/core/display/render.py +++ b/openlp/core/display/render.py @@ -47,8 +47,8 @@ log = logging.getLogger(__name__) ENGLISH_NOTES = '[CDEFGAB]?' GERMAN_NOTES = '[CDEFGABH]?' NEOLATIN_NOTES = '(Do|Re|Mi|Fa|Sol|La|Si)?' -CHORD_PREFIXES = '(=|\(|\|)*?' -CHORD_SUFFIXES = '(b|bb|#|##|x|-|m|maj|min|sus|dim|0|1|2|3|4|5|6|7|8|9|\))*?' +CHORD_PREFIXES = '(=|\\(|\\|)*?' +CHORD_SUFFIXES = '(b|bb|#|##|x|-|m|maj|min|sus|dim|0|1|2|3|4|5|6|7|8|9|\\))*?' SLIM_CHARS = 'fiíIÍjlĺľrtť.,;/ ()|"\'!:\\' CHORD_TEMPLATE = '{chord}' FIRST_CHORD_TEMPLATE = '{chord}' @@ -80,7 +80,7 @@ def _construct_chord_regex(notes): :param notes: The regular expression for a set of valid notes :return: An expanded regular expression for valid chords """ - #chord = CHORD_PREFIXES + notes + CHORD_SUFFIXES + # chord = CHORD_PREFIXES + notes + CHORD_SUFFIXES return '(' + CHORD_PREFIXES + notes + CHORD_SUFFIXES + '(/' + notes + CHORD_SUFFIXES + ')?)' @@ -270,7 +270,7 @@ def render_chords(text): rendered_lines.append(new_line) else: chords_on_prev_line = False - #rendered_lines.append(html.escape(line)) + # rendered_lines.append(html.escape(line)) chord_template = NO_CHORD_TEMPLATE new_line = chord_template.format(chord=line) rendered_lines.append(new_line) diff --git a/tests/openlp_core/display/test_render.py b/tests/openlp_core/display/test_render.py index 40ddee4aa..2ff35181a 100644 --- a/tests/openlp_core/display/test_render.py +++ b/tests/openlp_core/display/test_render.py @@ -104,7 +104,7 @@ def test_render_chords(settings): text_with_rendered_chords = render_chords(text_with_chords) # THEN: We should get html that looks like below - expected_html = 'HC' \ + expected_html = 'HC' \ 'alleluya.F' \ '   G/B' assert text_with_rendered_chords == expected_html, 'The rendered chords should look as expected'