Merge pull request #1058 from nathanielmanistaatgoogle/python-refactoring

Use distinct enums for distinct ticket types