From b8e764b89cfad88a6fe34a17937398a442e74ab7 Mon Sep 17 00:00:00 2001 From: crvi Date: Thu, 13 Aug 2020 21:18:03 +0530 Subject: test: python3 is unicode by default --- test/dbus/testutils.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/test/dbus/testutils.py b/test/dbus/testutils.py index 479eee5d..d9f3a8c9 100644 --- a/test/dbus/testutils.py +++ b/test/dbus/testutils.py @@ -53,26 +53,26 @@ except ImportError: def dict2event(d): ev = Event() - ev[0][Event.Id] = d.get("id", "").encode("UTF-8") - ev.timestamp = str(d.get("timestamp", "")) - ev.interpretation = str(d.get("interpretation", "").encode("UTF-8")) - ev.manifestation = str(d.get("manifestation", "").encode("UTF-8")) - ev.actor = str(d.get("actor", "").encode("UTF-8")) - ev.origin = str(d.get("origin", "").encode("UTF-8")) - ev.payload = str(d.get("payload", "").encode("UTF-8")) + ev[0][Event.Id] = d.get("id", "") + ev.timestamp = d.get("timestamp", "") + ev.interpretation = d.get("interpretation", "") + ev.manifestation = d.get("manifestation", "") + ev.actor = d.get("actor", "") + ev.origin = d.get("origin", "") + ev.payload = d.get("payload", "") subjects = d.get("subjects", []) for sd in subjects: subj = Subject() - subj.uri = str(sd.get("uri", "").encode("UTF-8")) - subj.current_uri = str(sd.get("current_uri", "")).encode("UTF-8") - subj.interpretation = str(sd.get("interpretation", "").encode("UTF-8")) - subj.manifestation = str(sd.get("manifestation", "").encode("UTF-8")) - subj.origin = str(sd.get("origin", "").encode("UTF-8")) - subj.current_origin = str(sd.get("current_origin", "")).encode("UTF-8") - subj.mimetype = str(sd.get("mimetype", "").encode("UTF-8")) - subj.text = str(sd.get("text", "").encode("UTF-8")) - subj.storage = str(sd.get("storage", "").encode("UTF-8")) + subj.uri = sd.get("uri", "") + subj.current_uri = sd.get("current_uri", "") + subj.interpretation = sd.get("interpretation", "") + subj.manifestation = sd.get("manifestation", "") + subj.origin = sd.get("origin", "") + subj.current_origin = sd.get("current_origin", "") + subj.mimetype = sd.get("mimetype", "") + subj.text = sd.get("text", "") + subj.storage = sd.get("storage", "") ev.append_subject(subj) return ev -- cgit v1.2.1