mirror of https://github.com/python/cpython
bpo-8231: Call idlelib.IdleConf.GetUserCfgDir only once. (#2629)
This commit is contained in:
parent
24f2e19d68
commit
223c7e70e4
|
@ -172,10 +172,10 @@ class IdleConf:
|
|||
"Populate default and user config parser dictionaries."
|
||||
#build idle install path
|
||||
if __name__ != '__main__': # we were imported
|
||||
idleDir=os.path.dirname(__file__)
|
||||
idleDir = os.path.dirname(__file__)
|
||||
else: # we were exec'ed (for testing only)
|
||||
idleDir=os.path.abspath(sys.path[0])
|
||||
userDir=self.GetUserCfgDir()
|
||||
idleDir = os.path.abspath(sys.path[0])
|
||||
self.userdir = userDir = self.GetUserCfgDir()
|
||||
|
||||
defCfgFiles = {}
|
||||
usrCfgFiles = {}
|
||||
|
|
|
@ -103,8 +103,8 @@ class EditorWindow(object):
|
|||
self.tkinter_vars = {} # keys: Tkinter event names
|
||||
# values: Tkinter variable instances
|
||||
self.top.instance_dict = {}
|
||||
self.recent_files_path = os.path.join(idleConf.GetUserCfgDir(),
|
||||
'recent-files.lst')
|
||||
self.recent_files_path = os.path.join(
|
||||
idleConf.userdir, 'recent-files.lst')
|
||||
self.text_frame = text_frame = Frame(top)
|
||||
self.vbar = vbar = Scrollbar(text_frame, name='vbar')
|
||||
self.width = idleConf.GetOption('main', 'EditorWindow',
|
||||
|
|
|
@ -117,8 +117,8 @@ class PyShellEditorWindow(EditorWindow):
|
|||
self.text.bind("<<clear-breakpoint-here>>", self.clear_breakpoint_here)
|
||||
self.text.bind("<<open-python-shell>>", self.flist.open_shell)
|
||||
|
||||
self.breakpointPath = os.path.join(idleConf.GetUserCfgDir(),
|
||||
'breakpoints.lst')
|
||||
self.breakpointPath = os.path.join(
|
||||
idleConf.userdir, 'breakpoints.lst')
|
||||
# whenever a file is changed, restore breakpoints
|
||||
def filename_changed_hook(old_hook=self.io.filename_change_hook,
|
||||
self=self):
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
IDLE: call config.IdleConf.GetUserCfgDir only once.
|
Loading…
Reference in New Issue