[MRG] Remove dependency on six
#2984
+476
−543
Merged
six
#2984