FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-21519: IDLE basic custom key entry detects duplicates. by terryjreedy · Pull Request #2428 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

bpo-21519: IDLE basic custom key entry detects duplicates. #2428

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.

Sign up for GitHub

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

Merged
terryjreedy merged 2 commits into from
Jun 27, 2017
Conversation 1 Commits 2 Checks 0 Files changed
Merged

bpo-21519: IDLE basic custom key entry detects duplicates. #2428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63dbc94
bpo-21519: IDLE basic custom key entry detects duplicates.
terryjreedy Jun 27, 2017
fc81d0c
News entry
terryjreedy Jun 27, 2017
File filter

Filter by extension

Filter by extension .py  (2) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
6 changes: 3 additions & 3 deletions Lib/idlelib/config_key.py
Show comments
View file
Open in desktop
This file contains hidden or 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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,10 @@ def KeysOK(self, keys):
'''
finalKey = self.listKeysFinal.get(ANCHOR)
modifiers = self.GetModifiers()
# create a key sequence list for overlap check:
keySequence = keys.split()
keysOK = False
title = self.keyerror_title
key_sequences = [key for keylist in self.currentKeySequences
for key in keylist]
if not keys.endswith('>'):
self.showerror(title, parent=self,
message='Missing the final Key')
Expand All @@ -267,7 +267,7 @@ def KeysOK(self, keys):
msg = 'The shift modifier by itself may not be used with'\
' this key symbol.'
self.showerror(title=title, parent=self, message=msg)
elif keySequence in self.currentKeySequences:
elif keys in key_sequences:
msg = 'This key combination is already in use.'
self.showerror(title=title, parent=self, message=msg)
else:
Expand Down
14 changes: 10 additions & 4 deletions Lib/idlelib/idle_test/test_config_key.py
Show comments
View file
Open in desktop
This file contains hidden or 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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ def setUpClass(cls):
requires('gui')
cls.root = Tk()
cls.root.withdraw()
keylist = [['<Key-F12>'], ['<Control-Key-x>', '<Control-Key-X>']]
cls.dialog = cls.Validator(
cls.root, 'Title', '<<Test>>', [['<Key-F12>']], _utest=True)
cls.root, 'Title', '<<Test>>', keylist, _utest=True)

@classmethod
def tearDownClass(cls):
Expand Down Expand Up @@ -78,10 +79,15 @@ def test_keys_shift_bad(self):
self.dialog.GetModifiers.result = []

def test_keys_dup(self):
self.dialog.listKeysFinal.get.result = 'F12'
for mods, final, seq in (([], 'F12', '<Key-F12>'),
(['Control'], 'x', '<Control-Key-x>'),
(['Control'], 'X', '<Control-Key-X>')):
with self.subTest(m=mods, f=final, s=seq):
self.dialog.listKeysFinal.get.result = final
self.dialog.GetModifiers.result = mods
self.assertFalse(self.dialog.KeysOK(seq))
self.assertIn('already in use', self.dialog.showerror.message)
self.dialog.GetModifiers.result = []
self.assertFalse(self.dialog.KeysOK('<Key-F12>'))
self.assertIn('already in use', self.dialog.showerror.message)

def test_bind_ok(self):
self.assertTrue(self.dialog.bind_ok('<Control-Shift-Key-a>'))
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/IDLE/2017-06-27-00-29-56.bpo-21519.fTj9T0.rst
Show comments
View file
Open in desktop
This file contains hidden or 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
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
IDLE's basic custom key entry dialog now detects duplicates properly.
Original patch by Saimadhav Heblikar.
Back | FazBrowse Home | New Git URL