Fix input gesture identifier normalization. #6962
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
Previously, arbitrarily ordered items (e.g. multiple keys) were reordered using Python set order. However, different input ordering could incorrectly cause different output in some cases due to hash bucket conflicts. For example, dot4+space and space+dot4 incorrectly produced different output. In addition, these items were reordered *before* conversion to lower case instead of after, which could also incorrectly result in different output. Now, the entire identifier is converted to lower case and arbitrarily ordered items are then sorted by character. The InputGesture.identifiers property has been changed so that it is no longer normalized. Instead, there is now an InputGesture.normalizedIdentifiers property which returns normalized identifiers. This was done to make normalization changes easier to apply and to eliminate the potential for normalization errors in InputGesture subclasses. The InputGesture.logIdentifier property is now deprecated. InputGesture.identifiers[0] should be used instead. Finally, various InputGesture implementations have been changed to remove normalization code. In some cases, this may result in nicer reporting in input help mode.
feerrenrut
approved these changes
Mar 13, 2017
| """ | ||
| identifier = identifier.lower() |
There was a problem hiding this comment.
is this locale dependant? Will it use the system locale or the invariant locale by default?
There was a problem hiding this comment.
If the string has any non-ASCII characters in it, it should be unicode, in which case .lower() will operate using the Unicode database:
>>> ua = u'\u0391'
>>> unicodedata.name(ua)
'GREEK CAPITAL LETTER ALPHA'
>>> la = ua.lower(); la
u'\u03b1'
>>> unicodedata.name(la)
'GREEK SMALL LETTER ALPHA'
| for modVk, modExt in self.generalizedModifiers: | ||
| if isNVDAModifierKey(modVk, modExt): | ||
| modTexts.add("NVDA") | ||
| modTexts.append("NVDA") |
There was a problem hiding this comment.
Does this need to be uppercase for some reason? It will get converted to lowercase right? Or is it for the log output?
There was a problem hiding this comment.
It gets converted to lower case when normalised. However, we want it to be displayed in upper case in log output, since that's how we write it in documentation.
source/touchHandler.py
Outdated
| @@ -160,22 +160,10 @@ def _get__rawIdentifiers(self): | |||
| if self.tracker.actionCount>1: | |||
| ID+="%s_"%self.counterNames[min(self.tracker.actionCount,4)-1] | |||
| ID+=self.tracker.action | |||
| IDs.append("TS(%s):%s"%(self.mode,ID)) | |||
| IDs.append("ts(%s):%s"%(self.mode,ID)) | |||
There was a problem hiding this comment.
what does ts mean? could you add a comment to explain please.
jcsteh
added a commit
that referenced
this pull request
Mar 14, 2017
jcsteh
added a commit
that referenced
this pull request
Mar 29, 2017
jcsteh
added a commit
that referenced
this pull request
Jun 21, 2017
…rs; we got rid of that in #6962. Make it possible to get the display text from a braille keyboard gesture identifier (as used in the Input Gestures dialog).
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.
Previously, arbitrarily ordered items (e.g. multiple keys) were reordered using Python set order. However, different input ordering could incorrectly cause different output in some cases due to hash bucket conflicts. For example, dot4+space and space+dot4 incorrectly produced different output.
In addition, these items were reordered before conversion to lower case instead of after, which could also incorrectly result in different output.
Now, the entire identifier is converted to lower case and arbitrarily ordered items are then sorted by character.
The InputGesture.identifiers property has been changed so that it is no longer normalized. Instead, there is now an InputGesture.normalizedIdentifiers property which returns normalized identifiers.
This was done to make normalization changes easier to apply and to eliminate the potential for normalization errors in InputGesture subclasses.
The InputGesture.logIdentifier property is now deprecated. InputGesture.identifiers[0] should be used instead.
Finally, various InputGesture implementations have been changed to remove normalization code. In some cases, this may result in nicer reporting in input help mode.
Fixes #6945. Re #3157.