BUG: remove six import
Merge pull request #4250 from cpcloud/six-fix

BUG: remove six import