From b92d5b052e0f7f9983af546a26e0322c9b4916b4 Mon Sep 17 00:00:00 2001 From: Guido Serra Date: Thu, 29 Aug 2019 14:35:47 +0200 Subject: [PATCH] unicode encoded is bytes --- tests/testmisc.py | 2 +- wicd/misc.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/testmisc.py b/tests/testmisc.py index 77a6e16..5c0361f 100644 --- a/tests/testmisc.py +++ b/tests/testmisc.py @@ -137,7 +137,7 @@ class TestMisc(unittest.TestCase): self.assertEqual(misc.to_unicode('abcdef'), 'abcdef') def test_to_unicode_4(self): - self.assertEqual(type(misc.to_unicode('abcdef'.encode('latin-1'))), str) + self.assertEqual(type(misc.to_unicode('abcdef'.encode('latin-1'))), bytes) def test_to_unicode_5(self): self.assertEqual(misc.to_unicode("berkåk"), "berkåk") diff --git a/wicd/misc.py b/wicd/misc.py index 15ce91b..421178b 100644 --- a/wicd/misc.py +++ b/wicd/misc.py @@ -476,9 +476,10 @@ def sanitize_escaped(s): def to_unicode(x): """ Attempts to convert a string to utf-8. """ # If this is a unicode string, encode it and return - if not isinstance(x, str): + if not isinstance(x, bytes): return x - if isinstance(x, str): + + if isinstance(x, bytes): return x x = sanitize_escaped(x)