diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2015-08-10 18:29:33 +0200 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-09-01 11:42:01 +0200 |
| commit | dd16cc98b0d67f1448bf9de25f8adce512b1431c (patch) | |
| tree | e9fa6c41da6894b16a366b02d61c29b15c5a9b4a /ipalib/rpc.py | |
| parent | 404177f7a322ced4e05cfc6b2ed330b6fcce0c04 (diff) | |
| download | freeipa-dd16cc98b0d67f1448bf9de25f8adce512b1431c.tar.gz freeipa-dd16cc98b0d67f1448bf9de25f8adce512b1431c.tar.xz freeipa-dd16cc98b0d67f1448bf9de25f8adce512b1431c.zip | |
Use six.string_types instead of "basestring"
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipalib/rpc.py')
| -rw-r--r-- | ipalib/rpc.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ipalib/rpc.py b/ipalib/rpc.py index 9d0fc8f7b..0dc897a08 100644 --- a/ipalib/rpc.py +++ b/ipalib/rpc.py @@ -41,13 +41,14 @@ import urllib import json import socket from urllib2 import urlparse - from xmlrpclib import (Binary, Fault, DateTime, dumps, loads, ServerProxy, Transport, ProtocolError, MININT, MAXINT) + import gssapi from dns import resolver, rdatatype from dns.exception import DNSException from nss.error import NSPRError +import six from ipalib.backend import Connectible from ipalib.constants import LDAP_GENERALIZED_TIME_FORMAT @@ -339,7 +340,7 @@ def json_decode_binary(val): elif isinstance(val, list): return tuple(json_decode_binary(v) for v in val) else: - if isinstance(val, basestring): + if isinstance(val, six.string_types): try: return val.decode('utf-8') except UnicodeDecodeError: |