Remove all usage of six library

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

Change-Id: I9d5e9fce5d387c655c0bfc1bdcb699a1aa0f56a1
2 files changed