mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-29 15:28:56 +00:00
Code Issues Releases Wiki Activity

Remove dependency on python3-six

Browse Source 
Since Python 2 support was removed in 1ca0323e7c ("Require Python 3 and
remove support for Python 2."), python3-six is not needed anymore.

Moreover python3-six is not available on RHEL/CentOS7 without using EPEL
and so this patch is needed in order to release OVS 2.13 on RHEL7.

Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
This commit is contained in:
Timothy Redaelli
2019-12-20 18:35:08 +01:00
committed by Ben Pfaff
parent 24e6970809
commit 0c4d144a98
38 changed files with 181 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
python/ovs/unixctl/__init__.py
View File

@@ -16,10 +16,7 @@ import sys
import ovs.util
import six
commands = {}
strtypes = six.string_types
class _UnixctlCommand(object):
@@ -59,8 +56,8 @@ def command_register(name, usage, min_args, max_args, callback, aux):
request at a time, so a reply must be made eventually to avoid blocking
that connection."""
assert isinstance(name, strtypes)
assert isinstance(usage, strtypes)
assert isinstance(name, str)
assert isinstance(usage, str)
assert isinstance(min_args, int)
assert isinstance(max_args, int)
assert callable(callback)
@@ -71,7 +68,7 @@ def command_register(name, usage, min_args, max_args, callback, aux):
def socket_name_from_target(target):
assert isinstance(target, strtypes)
assert isinstance(target, str)
""" On Windows an absolute path contains ':' ( i.e: C:\\ ) """
if target.startswith('/') or target.find(':') > -1: