diff options
| author | terryjreedy <tjreedy@udel.edu> | 2017-07-08 02:47:37 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-08 02:47:37 (GMT) |
| commit | 552f26680d3806df7c27dd7161fd7d57ac815f78 (patch) | |
| tree | ce4e6991bbc34cc7a7249ff4e0902b0143fd6692 /Lib | |
| parent | 9d8abf31c430dd83d073660cc92f1fe4ca6f2cd4 (diff) | |
| download | cpython-552f26680d3806df7c27dd7161fd7d57ac815f78.zip cpython-552f26680d3806df7c27dd7161fd7d57ac815f78.tar.gz cpython-552f26680d3806df7c27dd7161fd7d57ac815f78.tar.bz2 | |
[3.6] bpo-8231: Call idlelib.IdleConf.GetUserCfgDir only once. (GH-2629) (#2631)
(cherry picked from commit 223c7e7)
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/idlelib/config.py | 6 | ||||
| -rw-r--r-- | Lib/idlelib/editor.py | 4 | ||||
| -rwxr-xr-x | Lib/idlelib/pyshell.py | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Lib/idlelib/config.py b/Lib/idlelib/config.py index 621e0bf..ed37f11 100644 --- a/Lib/idlelib/config.py +++ b/Lib/idlelib/config.py @@ -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 = {} diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py index 5b64ef4..43b105f 100644 --- a/Lib/idlelib/editor.py +++ b/Lib/idlelib/editor.py @@ -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', diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py index be7bd3d..47df744 100755 --- a/Lib/idlelib/pyshell.py +++ b/Lib/idlelib/pyshell.py @@ -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): |