Skip to content

Commit 223c7e7

Browse files
authored
bpo-8231: Call idlelib.IdleConf.GetUserCfgDir only once. (#2629)
1 parent 24f2e19 commit 223c7e7

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

Lib/idlelib/config.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,10 @@ def CreateConfigHandlers(self):
172172
"Populate default and user config parser dictionaries."
173173
#build idle install path
174174
if __name__ != '__main__': # we were imported
175-
idleDir=os.path.dirname(__file__)
175+
idleDir = os.path.dirname(__file__)
176176
else: # we were exec'ed (for testing only)
177-
idleDir=os.path.abspath(sys.path[0])
178-
userDir=self.GetUserCfgDir()
177+
idleDir = os.path.abspath(sys.path[0])
178+
self.userdir = userDir = self.GetUserCfgDir()
179179

180180
defCfgFiles = {}
181181
usrCfgFiles = {}

Lib/idlelib/editor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ def __init__(self, flist=None, filename=None, key=None, root=None):
103103
self.tkinter_vars = {} # keys: Tkinter event names
104104
# values: Tkinter variable instances
105105
self.top.instance_dict = {}
106-
self.recent_files_path = os.path.join(idleConf.GetUserCfgDir(),
107-
'recent-files.lst')
106+
self.recent_files_path = os.path.join(
107+
idleConf.userdir, 'recent-files.lst')
108108
self.text_frame = text_frame = Frame(top)
109109
self.vbar = vbar = Scrollbar(text_frame, name='vbar')
110110
self.width = idleConf.GetOption('main', 'EditorWindow',

Lib/idlelib/pyshell.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ def __init__(self, *args):
117117
self.text.bind("<<clear-breakpoint-here>>", self.clear_breakpoint_here)
118118
self.text.bind("<<open-python-shell>>", self.flist.open_shell)
119119

120-
self.breakpointPath = os.path.join(idleConf.GetUserCfgDir(),
121-
'breakpoints.lst')
120+
self.breakpointPath = os.path.join(
121+
idleConf.userdir, 'breakpoints.lst')
122122
# whenever a file is changed, restore breakpoints
123123
def filename_changed_hook(old_hook=self.io.filename_change_hook,
124124
self=self):
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
IDLE: call config.IdleConf.GetUserCfgDir only once.

0 commit comments

Comments
 (0)