Maybe we can add this to our copy of `six`? (It's such a simple module that pulling in upstream changes shouldn't be too hard.)