diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2015-11-12 15:03:17 -0500 |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2015-11-12 15:03:17 -0500 |
| commit | e19f3ec07228aeaa9bd1379413a3054953a5c51e (patch) | |
| tree | 958f95fe937af722c99f472ed2c9f1bc83880e8b /Lib/idlelib/PyShell.py | |
| parent | 2f85555531c79184767d4954f20e310beda99421 (diff) | |
| parent | d0c0f0041c3eb561adfa57179bc41f4dae212317 (diff) | |
| download | cpython-git-e19f3ec07228aeaa9bd1379413a3054953a5c51e.tar.gz | |
Merge with 3.4
Diffstat (limited to 'Lib/idlelib/PyShell.py')
| -rwxr-xr-x | Lib/idlelib/PyShell.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py index 57aa6dae2e..058dfb92e5 100755 --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -152,7 +152,7 @@ class PyShellEditorWindow(EditorWindow): # possible due to update in restore_file_breaks return if color: - theme = idleConf.GetOption('main','Theme','name') + theme = idleConf.CurrentTheme() cfg = idleConf.GetHighlight(theme, "break") else: cfg = {'foreground': '', 'background': ''} @@ -338,7 +338,7 @@ class ModifiedColorDelegator(ColorDelegator): def LoadTagDefs(self): ColorDelegator.LoadTagDefs(self) - theme = idleConf.GetOption('main','Theme','name') + theme = idleConf.CurrentTheme() self.tagdefs.update({ "stdin": {'background':None,'foreground':None}, "stdout": idleConf.GetHighlight(theme, "stdout"), @@ -621,7 +621,7 @@ class ModifiedInterpreter(InteractiveInterpreter): item = RemoteObjectBrowser.StubObjectTreeItem(self.rpcclt, oid) from idlelib.TreeWidget import ScrolledCanvas, TreeNode top = Toplevel(self.tkconsole.root) - theme = idleConf.GetOption('main','Theme','name') + theme = idleConf.CurrentTheme() background = idleConf.GetHighlight(theme, 'normal')['background'] sc = ScrolledCanvas(top, bg=background, highlightthickness=0) sc.frame.pack(expand=1, fill="both") |