fix ImportError with six 1.2.0
Merge pull request #259 from larsmans/six-importerror

fix ImportError with six 1.2.0