remove duplicate six import

apparently we had a duplicate import of six, noticed by pyflakes
in my buffer when loading up the file.

Change-Id: I2f5e03d1862711c7214c1e33b4500693aaabf567