Is the intention for Pillow to also provide Python 2 support?  If not, it's better to drop the #if and do the renames inline.