[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4 #22614

[terry.reedy]

https://hg.python.org/cpython/rev/4163079a717a
changeset:   93020:4163079a717a
parent:      93016:7620bf3b8281
parent:      93019:d686de84dc10
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Sun Oct 12 22:59:18 2014 -0400
summary:
  Merge with 3.4 #22614

files:
  Lib/idlelib/PyShell.py |  3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -151,6 +151,9 @@
 
     def color_breakpoint_text(self, color=True):
         "Turn colorizing of breakpoint text on or off"
+        if self.io is None:
+            # possible due to update in restore_file_breaks
+            return
         if color:
             theme = idleConf.GetOption('main','Theme','name')
             cfg = idleConf.GetHighlight(theme, "break")

-- 
Repository URL: https://hg.python.org/cpython