From 713d6c65fd545c6ad38d73686cfb040fd6dc217d Mon Sep 17 00:00:00 2001
From: Anthon van der Neut <anthon@mnt.org>
Date: Wed, 16 Jan 2019 08:14:14 +0100
Subject: insert merge key in old (absolute) position

---
 _test/test_z_data.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to '_test/test_z_data.py')

diff --git a/_test/test_z_data.py b/_test/test_z_data.py
index ca75ca6..99810aa 100644
--- a/_test/test_z_data.py
+++ b/_test/test_z_data.py
@@ -9,6 +9,7 @@ import warnings  # NOQA
 from ruamel.std.pathlib import Path
 
 base_path = Path('data')  # that is ruamel.yaml.data
+PY2 = sys.version_info[0] == 2
 
 
 class YAMLData(object):
@@ -124,7 +125,10 @@ class TestYAMLData(object):
         buf = StringIO()
         yaml.dump(data, buf)
         expected = input.value if output is None else output.value
-        assert buf.getvalue() == expected
+        value = buf.getvalue()
+        if PY2:
+            value = value.decode('utf-8')
+        assert value == expected
 
     def load_assert(self, input, confirm, yaml_version=None):
         from ruamel.yaml.compat import Mapping
-- 
cgit v1.2.1