[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Does the following Python error in the musicxml tests ring a bell?
From: |
Jonas Hahnfeld |
Subject: |
Re: Does the following Python error in the musicxml tests ring a bell? |
Date: |
Mon, 02 Mar 2020 21:19:01 +0100 |
User-agent: |
Evolution 3.34.4 |
Am Montag, den 02.03.2020, 20:10 +0100 schrieb David Kastrup:
> dev/translation-merge
>
> Fails at make test (at least on my system).
Ah, the merge re-instantiated some code for Python 2. The following
diff fixes 'make test' for me:
diff --git a/python/musicxml.py b/python/musicxml.py
index 06cfe6fd39..2af7eacc17 100644
--- a/python/musicxml.py
+++ b/python/musicxml.py
@@ -39,7 +39,7 @@ class Xml_node(object):
if not self._children:
return ''
- return ''.join([c.get_text() for c in self._children]).encode('utf-8')
+ return ''.join([c.get_text() for c in self._children])
def message(self, msg):
ly.warning(msg)
diff --git a/python/utilities.py b/python/utilities.py
index dfde3cc9fd..7fb2e897b5 100644
--- a/python/utilities.py
+++ b/python/utilities.py
@@ -63,8 +63,6 @@ def hex_to_color(hex_val):
return None
def split_string_and_preserve_doublequoted_substrings(value):
- if isinstance(value, unicode):
- value = value.encode('utf-8')
import shlex
lex = shlex.shlex(value)
lex.quotes = '"'
But very please DO NOT MERGE your branch dev/translation-merge into
master: It will pull in most of the cherry-picked commits from
stable/2.20 which will probably render 'git bisect' useless. Not sure
if that was done for previous releases but it certainly doesn't seem
right for that many commits in stable/2.20 that are not in master.
Jonas
signature.asc
Description: This is a digitally signed message part
- Does the following Python error in the musicxml tests ring a bell?, David Kastrup, 2020/03/02
- Re: Does the following Python error in the musicxml tests ring a bell?, Jonas Hahnfeld, 2020/03/02
- Re: Does the following Python error in the musicxml tests ring a bell?, David Kastrup, 2020/03/02
- Re: Does the following Python error in the musicxml tests ring a bell?,
Jonas Hahnfeld <=
- Re: Does the following Python error in the musicxml tests ring a bell?, David Kastrup, 2020/03/02
- Re: Does the following Python error in the musicxml tests ring a bell?, Jonas Hahnfeld, 2020/03/03
- Re: Does the following Python error in the musicxml tests ring a bell?, David Kastrup, 2020/03/03
- Re: Does the following Python error in the musicxml tests ring a bell?, Jonas Hahnfeld, 2020/03/03
- Re: Does the following Python error in the musicxml tests ring a bell?, David Kastrup, 2020/03/03
- Re: Does the following Python error in the musicxml tests ring a bell?, David Kastrup, 2020/03/03
- Re: Does the following Python error in the musicxml tests ring a bell?, Jonas Hahnfeld, 2020/03/03
- Re: Does the following Python error in the musicxml tests ring a bell?, David Kastrup, 2020/03/03
- Re: Does the following Python error in the musicxml tests ring a bell?, David Kastrup, 2020/03/03
- Re: Does the following Python error in the musicxml tests ring a bell?, Jonas Hahnfeld, 2020/03/03