From d3a2fae486585b6af1aa0e1a68ab71befa097f49 Mon Sep 17 00:00:00 2001
From: gugug <gu.jin@99cloud.net>
Date: Thu, 27 Aug 2020 23:10:05 +0800
Subject: [PATCH] Remove all usage of six library

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

Change-Id: I273fee5b36e9bb57e3120597314176e0eac17a78
---
 kuryr/lib/binding/drivers/utils.py | 3 +--
 lower-constraints.txt              | 1 -
 requirements.txt                   | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/kuryr/lib/binding/drivers/utils.py b/kuryr/lib/binding/drivers/utils.py
index 695a07ff..8e2f5bb2 100644
--- a/kuryr/lib/binding/drivers/utils.py
+++ b/kuryr/lib/binding/drivers/utils.py
@@ -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)
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 9fc1a234..46233307 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -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
diff --git a/requirements.txt b/requirements.txt
index e7df952d..ce945eea 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -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