[Libguestfs] [PATCH 4/4] hivex: python: Get rid of to_string function in test script

Since values are now returned as strings in Python2 and Python3, treating them as bytes in Python 3 would break tests. --- python/t/210-setvalue.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/python/t/210-setvalue.py b/python/t/210-setvalue.py index 9d93519..2ee7ac5 100644 --- a/python/t/210-setvalue.py +++ b/python/t/210-setvalue.py @@ -47,20 +47,12 @@ h.node_set_value (b, value1) value1 = { "key": "Key1", "t": 3, "value": "JKL" } h.node_set_value (b, value1) -# In Python2, the data is returned as a string. In Python3, it is -# returned as bytes. Provide a function to convert either to a string. -def to_string (data): - if sys.version_info[0] == 2: - return data - else: - return str (data, "utf-8") - val = h.node_get_value (b, "Key1") t_data = h.value_value (val) assert t_data[0] == 3 -assert to_string (t_data[1]) == "JKL" +assert t_data[1] == "JKL" val = h.node_get_value (b, "Key3") t_data = h.value_value (val) assert t_data[0] == 3 -assert to_string (t_data[1]) == "GHI" +assert t_data[1] == "GHI" -- 1.8.5.2