summaryrefslogtreecommitdiffstats
path: root/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py
diff options
context:
space:
mode:
authorNitin Goyal <nigoyal@redhat.com>2019-04-15 16:19:16 +0530
committerNitin Goyal <nigoyal@redhat.com>2019-04-15 16:40:21 +0000
commit21cba48297103a528edbc21ce04ee254d83bf151 (patch)
treeb9ed99b6e327ceaee946ff59c0c0f6f6e0bd3ac9 /openshift-storage-libs/openshiftstoragelibs/openshift_ops.py
parenta06a47467e3c7ad69e49ab4a27980af3494ee64e (diff)
Use py2/3 compatible string type checks
Replace usage of "types.StringTypes" with "six.string_types", because the latter one is compatible with both - py2 and py3. Change-Id: Ie8f9495914fca527da086af0915130470e3fd3e0
Diffstat (limited to 'openshift-storage-libs/openshiftstoragelibs/openshift_ops.py')
-rw-r--r--openshift-storage-libs/openshiftstoragelibs/openshift_ops.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py b/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py
index 7e30064..57c4dee 100644
--- a/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py
+++ b/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py
@@ -11,11 +11,11 @@ except ImportError:
# py2
import json
import re
-import types
from glusto.core import Glusto as g
from glustolibs.gluster import volume_ops
import mock
+import six
import yaml
from openshiftstoragelibs import command
@@ -201,7 +201,7 @@ def oc_rsh(ocp_node, pod_name, command, log_level=None):
A tuple consisting of the command return code, stdout, and stderr.
"""
prefix = ['oc', 'rsh', pod_name]
- if isinstance(command, types.StringTypes):
+ if isinstance(command, six.string_types):
cmd = ' '.join(prefix + [command])
else:
cmd = prefix + command