replace Cyan's xEnum by Python's enum #696
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Hoikas
reviewed
Aug 10, 2020
Scripts/Python/clftNpcZandi.py
Outdated
| @@ -86,9 +86,9 @@ | |||
| IgnoreTime = 120 | |||
| PageTurnInterval = 120 | |||
|
|
|||
| TimerID = xEnum.Enum("IgnoreFinished = 10, TurnPage") | |||
| TimerID = enum.IntEnum("TimerID", {"IgnoreFinished": 10, "TurnPage": 11}) | |||
There was a problem hiding this comment.
I considered it but I thought it could be too easily read over as "start=0" since that occurs in some places, though indeed it would be more consistent...
Hoikas
approved these changes
Aug 11, 2020
Hoikas
reviewed
Aug 14, 2020
Scripts/Python/grsnPowerOn.py
Outdated
| @@ -132,7 +132,9 @@ | |||
| gearStartingDown = False | |||
| weightEngageDisabled = False | |||
|
|
|||
| TimerID = xEnum.Enum("UpElevatorSwitch, DownElevatorSwitch") | |||
| class TimerID(enum.IntEnum): | |||
| UpElevatorSwitch = 1 | |||
There was a problem hiding this comment.
I think this will be more Pythonic in cases where we don't need to change the start value:
Suggested change
| UpElevatorSwitch = 1 | |
| UpElevatorSwitch = enum.auto() |
There was a problem hiding this comment.
Changed for all of the ones that start at 1!
Would be nice if there was a way to have auto but specify the starting value... Maybe I should take it up to python-dev ;)
Hoikas
approved these changes
Aug 14, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.