Should we just move all of the six-related stuff here and then the rest of the code just refers to botocore.compat?