New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
improve state management in speech.py #12395
Merged
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
7 tasks
See test results for failed build of commit 46cab6a7b4 |
feerrenrut
approved these changes
May 11, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Generally looks good!
source/speech/speech.py
Outdated
|
||
|
||
def initialize(): | ||
global _SpeechState |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this should be lower case: _speechState
aaclause
added a commit
to aaclause/BrailleExtender
that referenced
this pull request
May 14, 2021
4 tasks
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.
Link to issue number:
Fixes #12393, follow up of #12251
Summary of the issue:
Using shift to resume speech after using shift to pause speech does not resume speech.
This is because when
isPaused
is imported throughspeech\__init__.py
it is does not reference the global variable used inspeech.py
Description of how this pull request fixes the issue:
Removes the use of top level variables in
speech.py
in favour of a private dataclass to manage state, and an enum for certain modes. Constants (or rather, variables with names in all capitals) remain as is.Testing strategy:
Using reproduction steps in #12393 to manually test the pausing and resuming of speech.
System tests for this may be useful, but require a change to the system test spy synth driver.
Known issues with pull request:
None
Change log entries:
Developer changes:
speech.curWordChars
has been renamedspeech._curWordChars
speech
and can be accessed throughspeech.getState()
. These are readonly values now.speech.speechMode
usespeech.setSpeechMode
speech.SpeechMode
speech.speechMode_off
becomesspeech.SpeechMode.off
speech.speechMode_beeps
becomesspeech.SpeechMode.beeps
speech.speechMode_talk
becomesspeech.SpeechMode.talk
Code Review Checklist: