mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
#18151, part 1: Backport idlelilb portion of Andrew Svetlov's 3.4 patch
changing IOError to OSError (#16715).
This commit is contained in:
parent
50793b4438
commit
ba6c0d3b08
8 changed files with 18 additions and 22 deletions
|
@ -59,7 +59,7 @@ else:
|
|||
try:
|
||||
file.write(warnings.formatwarning(message, category, filename,
|
||||
lineno, line=line))
|
||||
except IOError:
|
||||
except OSError:
|
||||
pass ## file (probably __stderr__) is invalid, warning dropped.
|
||||
warnings.showwarning = idle_showwarning
|
||||
def idle_formatwarning(message, category, filename, lineno, line=None):
|
||||
|
@ -213,7 +213,7 @@ class PyShellEditorWindow(EditorWindow):
|
|||
try:
|
||||
with open(self.breakpointPath, "r") as fp:
|
||||
lines = fp.readlines()
|
||||
except IOError:
|
||||
except OSError:
|
||||
lines = []
|
||||
try:
|
||||
with open(self.breakpointPath, "w") as new_file:
|
||||
|
@ -224,7 +224,7 @@ class PyShellEditorWindow(EditorWindow):
|
|||
breaks = self.breakpoints
|
||||
if breaks:
|
||||
new_file.write(filename + '=' + str(breaks) + '\n')
|
||||
except IOError as err:
|
||||
except OSError as err:
|
||||
if not getattr(self.root, "breakpoint_error_displayed", False):
|
||||
self.root.breakpoint_error_displayed = True
|
||||
tkMessageBox.showerror(title='IDLE Error',
|
||||
|
@ -532,7 +532,7 @@ class ModifiedInterpreter(InteractiveInterpreter):
|
|||
return
|
||||
try:
|
||||
response = clt.pollresponse(self.active_seq, wait=0.05)
|
||||
except (EOFError, IOError, KeyboardInterrupt):
|
||||
except (EOFError, OSError, KeyboardInterrupt):
|
||||
# lost connection or subprocess terminated itself, restart
|
||||
# [the KBI is from rpc.SocketIO.handle_EOF()]
|
||||
if self.tkconsole.closing:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue