2
0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 22:35:15 +00:00

Remove dependency on python3-six

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

View File

@@ -16,13 +16,11 @@
rpcserver is an XML RPC server that allows RPC client to initiate tests
"""
from __future__ import print_function
import sys
import exceptions
import six.moves.xmlrpc_client
import xmlrpc.client
import tcp
@@ -113,8 +111,7 @@ class TestArena(xmlrpc.XMLRPC):
Returns the ovs-test server IP address that the other ovs-test server
with the given ip will see.
"""
server1 = six.moves.xmlrpc_client.Server("http://%s:%u/" %
(his_ip, his_port))
server1 = xmlrpc.client.Server("http://%s:%u/" % (his_ip, his_port))
return server1.get_my_address()
def xmlrpc_create_udp_listener(self, port):