From 21cba48297103a528edbc21ce04ee254d83bf151 Mon Sep 17 00:00:00 2001 From: Nitin Goyal Date: Mon, 15 Apr 2019 16:19:16 +0530 Subject: 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 --- openshift-storage-libs/openshiftstoragelibs/podcmd.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'openshift-storage-libs/openshiftstoragelibs/podcmd.py') diff --git a/openshift-storage-libs/openshiftstoragelibs/podcmd.py b/openshift-storage-libs/openshiftstoragelibs/podcmd.py index bf84a8b9..1787bf3c 100644 --- a/openshift-storage-libs/openshiftstoragelibs/podcmd.py +++ b/openshift-storage-libs/openshiftstoragelibs/podcmd.py @@ -47,9 +47,9 @@ lifetime of a function that addresses both hosts and pods. from collections import namedtuple from functools import partial, wraps -import types from glusto.core import Glusto as g +import six from openshiftstoragelibs import openshift_ops @@ -95,7 +95,7 @@ def run(target, command, log_level=None, orig_run=g.run): if isinstance(target, Pod): prefix = ['oc', 'rsh', target.podname] - if isinstance(command, types.StringTypes): + if isinstance(command, six.string_types): cmd = ' '.join(prefix + [command]) else: cmd = prefix + command -- cgit