[orca/gnome-3-34] shiftlock: Never drop shift from keybindings

[Joanmarie Diggs <joanied src gnome org>]

commit 898e98f163dc33b167dbe313581ae33fc0e878e8
Author: Samuel Thibault <samuel thibault ens-lyon org>
Date:   Tue Jan 28 20:25:37 2020 +0100

    shiftlock: Never drop shift from keybindings
    
    When setting a keybinding, orca tries to drop the underlying modifier of the
    Orca modifier from the shortcut, if any, since that modifier is not supposed
    to show up in the keyboard event, thanks to the keyboard modification.
    
    We however can not do this for the shift modifier (in the case xkb is
    configured with caps:shiftlock instead of caps:capslock), because then
    if the caps:capslock case, shortcuts which use orca+shift+key would get
    their shift modifier dropped.
    
    The underlying modifier is not supposed to show up here anyway (since we
    tinker with the xkb setup), so better not even try to fix them, it
    brings more harm than good.
    
    Fixes #87

 src/orca/orca_gui_prefs.py | 7 -------
 1 file changed, 7 deletions(-)
---
diff --git a/src/orca/orca_gui_prefs.py b/src/orca/orca_gui_prefs.py
index c8be8ce3a..5c577950b 100644
--- a/src/orca/orca_gui_prefs.py
+++ b/src/orca/orca_gui_prefs.py
@@ -2943,13 +2943,6 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
         if mods & (1 << pyatspi.MODIFIER_SHIFTLOCK) \
            and mods & keybindings.ORCA_MODIFIER_MASK:
             mods ^= (1 << pyatspi.MODIFIER_SHIFTLOCK)
-        try:
-            shiftmask = (1 << pyatspi.MODIFIER_SHIFT)
-        except:
-            shiftmask = 0
-        if mods & shiftmask \
-           and mods & keybindings.ORCA_MODIFIER_MASK:
-            mods ^= (1 << pyatspi.MODIFIER_SHIFT)
 
         treeModel.set(myiter,
                       modMask, str(keybindings.defaultModifierMask),