Skip to content

bpo-39388: IDLE: Fix bug when cancelling out of configdialog #18068

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
merged 5 commits into from
Jan 25, 2020
Merged

bpo-39388: IDLE: Fix bug when cancelling out of configdialog #18068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6f0e12b
bpo-39388: Fix bug when cancelling out of configdialog
csabella Jan 19, 2020
93196de
Merge remote-tracking branch 'origin/master' into pr_18068
terryjreedy Jan 25, 2020
80dc438
Add new test.
terryjreedy Jan 25, 2020
a9a1821
News items.
terryjreedy Jan 25, 2020
1ff8739
Change '__main__' to __name__ to work on all systems.
terryjreedy Jan 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Lib/idlelib/NEWS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ Released on 2020-10-05?
======================================


bpo-39050: Make Settings dialog Help button work again.
bpo-39388: Settings dialog Cancel button cancels pending changes.

bpo-39050: Settings dialog Help button again displays help text.

bpo-32989: Add tests for editor newline_and_indent_event method.
Remove unneeded arguments and dead code from pyparse
Expand Down
1 change: 1 addition & 0 deletions Lib/idlelib/configdialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ def cancel(self):
Methods:
destroy: inherited
"""
changes.clear()
self.destroy()

def destroy(self):
Expand Down
21 changes: 14 additions & 7 deletions Lib/idlelib/idle_test/test_configdialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,24 @@ def tearDownModule():
root.destroy()
root = dialog = None

class ConfigDialogTest(unittest.TestCase):

def test_help(self):
class DialogTest(unittest.TestCase):

@mock.patch(__name__+'.dialog.destroy', new_callable=Func)
def test_cancel(self, destroy):
changes['main']['something'] = 1
dialog.cancel()
self.assertEqual(changes['main'], {})
self.assertEqual(destroy.called, 1)

@mock.patch('idlelib.configdialog.view_text', new_callable=Func)
def test_help(self, view):
dialog.note.select(dialog.keyspage)
saved = configdialog.view_text
view = configdialog.view_text = Func()
dialog.help()
s = view.kwds['contents']
self.assertTrue(s.startswith('When you click'))
self.assertTrue(s.endswith('a different name.\n'))
configdialog.view_text = saved
self.assertTrue(s.startswith('When you click') and
s.endswith('a different name.\n'))


class FontPageTest(unittest.TestCase):
"""Test that font widgets enable users to make font changes.
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/IDLE/2020-01-25-02-26-45.bpo-39388.x4TQNh.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
IDLE Settings Cancel button now cancels pending changes