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 /ipatests/test_integration/env_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 'ipatests/test_integration/env_config.py')
| -rw-r--r-- | ipatests/test_integration/env_config.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ipatests/test_integration/env_config.py b/ipatests/test_integration/env_config.py index d16a3430d..96062bef3 100644 --- a/ipatests/test_integration/env_config.py +++ b/ipatests/test_integration/env_config.py @@ -28,6 +28,8 @@ import os import json import collections +import six + from ipapython import ipautil from ipatests.test_integration.config import Config, Domain @@ -128,7 +130,7 @@ def config_from_env(env): kwargs['domains'] = [] # $IPv6SETUP needs to be 'TRUE' to enable ipv6 - if isinstance(kwargs['ipv6'], basestring): + if isinstance(kwargs['ipv6'], six.string_types): kwargs['ipv6'] = (kwargs['ipv6'].upper() == 'TRUE') config = Config(**kwargs) |