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/config.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/config.py')
| -rw-r--r-- | ipalib/config.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ipalib/config.py b/ipalib/config.py index 760fa5bdd..90933b7a2 100644 --- a/ipalib/config.py +++ b/ipalib/config.py @@ -35,8 +35,10 @@ from types import NoneType import os from os import path import sys -from ipapython.dn import DN +import six + +from ipapython.dn import DN from ipalib.base import check_name from ipalib.constants import CONFIG_SECTION from ipalib.constants import OVERRIDE_ERROR, SET_ERROR, DEL_ERROR @@ -239,7 +241,7 @@ class Env(object): (self.__class__.__name__, key, self.__d[key], value) ) assert not hasattr(self, key) - if isinstance(value, basestring): + if isinstance(value, six.string_types): value = value.strip() if isinstance(value, str): value = value.decode('utf-8') |