2 files changed, 3 insertions, 3 deletions
diff --git a/ipalib/config.py b/ipalib/config.py
index 92a3235f5..44dedf294 100644
--- a/ipalib/config.py
+++ b/ipalib/config.py
@@ -244,7 +244,7 @@ class Env(object):
         assert not hasattr(self, key)
         if isinstance(value, six.string_types):
             value = value.strip()
-            if isinstance(value, str):
+            if isinstance(value, bytes):
                 value = value.decode('utf-8')
             m = {
                 'True': True,
diff --git a/ipalib/rpc.py b/ipalib/rpc.py
index 5b596b601..6a7f6982b 100644
--- a/ipalib/rpc.py
+++ b/ipalib/rpc.py
@@ -224,7 +224,7 @@ def xml_unwrap(value, encoding='UTF-8'):
             return dict(
                 (k, xml_unwrap(v, encoding)) for (k, v) in value.items()
             )
-    if type(value) is str:
+    if isinstance(value, bytes):
         return value.decode(encoding)
     if isinstance(value, Binary):
         assert type(value.data) is bytes
@@ -363,7 +363,7 @@ def json_decode_binary(val):
 
 def decode_fault(e, encoding='UTF-8'):
     assert isinstance(e, Fault)
-    if type(e.faultString) is str:
+    if isinstance(e.faultString, bytes):
         return Fault(e.faultCode, e.faultString.decode(encoding))
     return e