666fc883fa
Remove the use of six and move forward with Python3 only. Change-Id: Ia4694704e001df03ac489a4d8a491c1c784ec3f9