Remove all usage of six library

Convert all code to not require six library and instead
use python 3.x logic.

Change-Id: I273fee5b36e9bb57e3120597314176e0eac17a78
This commit is contained in:
gugug 2020-08-27 23:10:05 +08:00
parent 78737f6eb9
commit d3a2fae486
3 changed files with 1 additions and 4 deletions

View File

@ -13,7 +13,6 @@ import ipaddress
import pyroute2
from pyroute2.netlink.rtnl import ifinfmsg
import six
from kuryr.lib import constants
@ -107,7 +106,7 @@ def _configure_container_iface(iface, subnets, fixed_ips, mtu=None,
if IP_ADDRESS_KEY in fixed_ip and (SUBNET_ID_KEY in fixed_ip):
subnet_id = fixed_ip[SUBNET_ID_KEY]
subnet = subnets_dict[subnet_id]
cidr = ipaddress.ip_network(six.text_type(subnet['cidr']))
cidr = ipaddress.ip_network(str(subnet['cidr']))
iface.add_ip(fixed_ip[IP_ADDRESS_KEY], cidr.prefixlen)
if mtu is not None:
iface.set_mtu(mtu)

View File

@ -90,7 +90,6 @@ requestsexceptions==1.2.0
rfc3986==0.3.1
Routes==2.3.1
simplejson==3.5.1
six==1.10.0
snowballstemmer==1.2.1
SQLAlchemy==1.0.10
sqlalchemy-migrate==0.11.0

View File

@ -13,4 +13,3 @@ oslo.utils>=3.33.0 # Apache-2.0
pbr!=2.1.0,>=2.0.0 # Apache-2.0
pyroute2>=0.4.21;sys_platform!='win32' # Apache-2.0 (+ dual licensed GPL2)
python-neutronclient>=6.7.0 # Apache-2.0
six>=1.10.0 # MIT