diff options
| author | Russell Bryant <russell@ovn.org> | 2015-12-14 17:21:26 -0500 |
|---|---|---|
| committer | Russell Bryant <russell@ovn.org> | 2016-02-02 16:41:01 -0500 |
| commit | 1ccbf95c6eaccb371227dd58455163840d6cc2d0 (patch) | |
| tree | 63d7397b75270f8337b708177ce3546c260a6d3a /python | |
| parent | 25f599fbd3452a0b1dbb0f22c2f54b2cc0f93bc9 (diff) | |
| download | openvswitch-1ccbf95c6eaccb371227dd58455163840d6cc2d0.tar.gz | |
python: Drop use of types.StringTypes.
types.StringTypes does not exist in Python 3. We can use
six.string_types, instead.
Signed-off-by: Russell Bryant <russell@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'python')
| -rw-r--r-- | python/ovs/unixctl/__init__.py | 4 | ||||
| -rw-r--r-- | python/ovs/unixctl/client.py | 5 | ||||
| -rw-r--r-- | python/ovs/unixctl/server.py | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/python/ovs/unixctl/__init__.py b/python/ovs/unixctl/__init__.py index c6484c446..26e126a97 100644 --- a/python/ovs/unixctl/__init__.py +++ b/python/ovs/unixctl/__init__.py @@ -14,10 +14,12 @@ import types +import six + import ovs.util commands = {} -strtypes = types.StringTypes +strtypes = six.string_types class _UnixctlCommand(object): diff --git a/python/ovs/unixctl/client.py b/python/ovs/unixctl/client.py index be6dee4dd..1b247c4cd 100644 --- a/python/ovs/unixctl/client.py +++ b/python/ovs/unixctl/client.py @@ -13,7 +13,8 @@ # limitations under the License. import os -import types + +import six import ovs.jsonrpc import ovs.stream @@ -21,7 +22,7 @@ import ovs.util vlog = ovs.vlog.Vlog("unixctl_client") -strtypes = types.StringTypes +strtypes = six.string_types class UnixctlClient(object): diff --git a/python/ovs/unixctl/server.py b/python/ovs/unixctl/server.py index 4ea19a1fe..cc712bf41 100644 --- a/python/ovs/unixctl/server.py +++ b/python/ovs/unixctl/server.py @@ -15,7 +15,6 @@ import copy import errno import os -import types import six from six.moves import range @@ -30,7 +29,7 @@ import ovs.vlog Message = ovs.jsonrpc.Message vlog = ovs.vlog.Vlog("unixctl_server") -strtypes = types.StringTypes +strtypes = six.string_types class UnixctlConnection(object): |