Skip to content

bpo-30917: IDLE: Add config.IdleConf unittest #2691

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 22 commits into from
Jul 18, 2017
Merged

bpo-30917: IDLE: Add config.IdleConf unittest #2691

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
4d90afc
bpo-30917: IDLE: Add config.IdleConf unittest
mlouielu Jul 13, 2017
9fc7670
Add pragma to exclude coverage count
mlouielu Jul 13, 2017
d4dac80
Add unittest
mlouielu Jul 13, 2017
eb32d91
Add gui requires
mlouielu Jul 13, 2017
ddedbc7
Revert "Add pragma to exclude coverage count"
mlouielu Jul 15, 2017
06d8329
Add MacOS specific test correct
mlouielu Jul 15, 2017
f29e0da
Split get_user_config_dir to unix and windows
mlouielu Jul 15, 2017
3f2fdcc
Remove unused import
mlouielu Jul 15, 2017
e445a0e
Destroy tk.root after test cases end
mlouielu Jul 15, 2017
0f1607d
Add skipIf at get_user_cfg_dir test
mlouielu Jul 17, 2017
980a801
Update mock_config to deepcopy make it faster
mlouielu Jul 17, 2017
4ecfb1a
Add comment explain why put extra_help_source_list in same test
mlouielu Jul 18, 2017
d9b3702
Add disable extension to unittest
mlouielu Jul 18, 2017
511b726
Add get_keybinding unittest
mlouielu Jul 18, 2017
49e0534
Add save_user_cfg_files unittest
mlouielu Jul 18, 2017
7fba576
News blurb
terryjreedy Jul 18, 2017
206ae1e
supress warnintg, update coverage
terryjreedy Jul 18, 2017
c850b7f
Update 2017-07-17-23-35-57.bpo-30917.hSiuuO.rst
terryjreedy Jul 18, 2017
ef45060
Addressed terry's comments
mlouielu Jul 18, 2017
7627733
Put extra help source list input data reverse to check it is sorted
mlouielu Jul 18, 2017
2cbb960
Merge branch 'add_idleconf_unittest' of github.com:mlouielu/cpython i…
mlouielu Jul 18, 2017
c94d4b5
Remove sorted in RemoveKeyBindNames
mlouielu Jul 18, 2017
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions Lib/idlelib/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,15 @@ class IdleConf:
for config_type in self.config_types:
(user home dir)/.idlerc/config-{config-type}.cfg
"""
def __init__(self):
def __init__(self, _utest=False):
self.config_types = ('main', 'highlight', 'keys', 'extensions')
self.defaultCfg = {}
self.userCfg = {}
self.cfg = {} # TODO use to select userCfg vs defaultCfg
self.CreateConfigHandlers()
self.LoadCfgFiles()

if not _utest:
self.CreateConfigHandlers()
self.LoadCfgFiles()

def CreateConfigHandlers(self):
"Populate default and user config parser dictionaries."
Expand Down Expand Up @@ -463,16 +464,8 @@ def GetExtensions(self, active_only=True,

def RemoveKeyBindNames(self, extnNameList):
"Return extnNameList with keybinding section names removed."
# TODO Easier to return filtered copy with list comp
names = extnNameList
kbNameIndicies = []
for name in names:
if name.endswith(('_bindings', '_cfgBindings')):
kbNameIndicies.append(names.index(name))
kbNameIndicies.sort(reverse=True)
for index in kbNameIndicies: #delete each keybinding section name
del(names[index])
return names
return sorted(
[n for n in extnNameList if not n.endswith(('_bindings', '_cfgBindings'))])
Copy link
Member

@terryjreedy terryjreedy Jul 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original deleted in_place and did not sort. It was a roundabout version of

for i in reversed(range(names)): if names[i].endswith(('_bindings', '_cfgBindings')): del(names[i])

I checked that in-place and sorted are not needed. In fact, when doing cleanups, this should be a set comprehension. The using code can then use set union in place of 3 current lines.
Copy link
Member

@terryjreedy terryjreedy Jul 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

 def RemoveKeyBindNames(self, extnNameList): "Return extnNameList with keybinding section names removed." - return sorted( - [n for n in extnNameList if not n.endswith(('_bindings', '_cfgBindings'))]) + return [n for n in extnNameList + if not n.endswith(('_bindings', '_cfgBindings'))]
Copy link
Contributor

@csabella csabella Jul 17, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was the sorted to be removed?
Copy link
Member

@terryjreedy terryjreedy Jul 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will if I feel like it.

def GetExtnNameForEvent(self, virtualEvent):
"""Return the name of the extension binding virtualEvent, or None.
Expand Down
Loading