Restore and fix extern-calendar feature
PEP8