pillar/__init__.py: use modern "except X as Y" syntax