traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#18151, part 1: Backport idlelilb portion of Andrew Svetlov's 3.4 patch 

changing IOError to OSError (#16715).
This commit is contained in:
Terry Jan Reedy 2013-06-08 00:22:45 -04:00
parent 50793b4438
commit ba6c0d3b08
8 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/idlelib/EditorWindow.py
View File

@ -901,7 +901,7 @@ class EditorWindow(object):
with open(self.recent_files_path, 'w',
encoding='utf_8', errors='replace') as rf_file:
rf_file.writelines(rf_list)
except IOError as err:
except OSError as err:
if not getattr(self.root, "recentfilelist_error_displayed", False):
self.root.recentfilelist_error_displayed = True
tkMessageBox.showerror(title='IDLE Error',

2
Lib/idlelib/GrepDialog.py
View File

@ -82,7 +82,7 @@ class GrepDialog(SearchDialogBase):
for fn in list:
try:
f = open(fn, errors='replace')
except IOError as msg:
except OSError as msg:
print(msg)
continue
lineno = 0

4
Lib/idlelib/IOBinding.py
View File

@ -213,7 +213,7 @@ class IOBinding:
f.seek(0)
bytes = f.read()
f.close()
except IOError as msg:
except OSError as msg:
tkMessageBox.showerror("I/O Error", str(msg), master=self.text)
return False
chars, converted = self._decode(two_lines, bytes)
@ -378,7 +378,7 @@ class IOBinding:
f.flush()
f.close()
return True
except IOError as msg:
except OSError as msg:
tkMessageBox.showerror("I/O Error", str(msg),
master=self.text)
return False

2
Lib/idlelib/OutputWindow.py
View File

@ -106,7 +106,7 @@ class OutputWindow(EditorWindow):
f = open(filename, "r")
f.close()
break
except IOError:
except OSError:
continue
else:
return None

8
Lib/idlelib/PyShell.py
View File

@ -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:

18
Lib/idlelib/configHandler.py
View File

@ -142,7 +142,7 @@ class IdleUserConfParser(IdleConfParser):
fname = self.file
try:
cfgFile = open(fname, 'w')
except IOError:
except OSError:
os.unlink(fname)
cfgFile = open(fname, 'w')
with cfgFile:
@ -207,7 +207,7 @@ class IdleConf:
userDir+',\n but the path does not exist.\n')
try:
sys.stderr.write(warn)
except IOError:
except OSError:
pass
userDir = '~'
if userDir == "~": # still no path to home!
@ -217,7 +217,7 @@ class IdleConf:
if not os.path.exists(userDir):
try:
os.mkdir(userDir)
except (OSError, IOError):
except OSError:
warn = ('\n Warning: unable to create user config directory\n'+
userDir+'\n Check path and permissions.\n Exiting!\n\n')
sys.stderr.write(warn)
@ -251,7 +251,7 @@ class IdleConf:
raw=raw)))
try:
sys.stderr.write(warning)
except IOError:
except OSError:
pass
try:
if self.defaultCfg[configType].has_option(section,option):
@ -268,13 +268,11 @@ class IdleConf:
(option, section, default))
try:
sys.stderr.write(warning)
except IOError:
except OSError:
pass
return default
def SetOption(self, configType, section, option, value):
"""In user's config file, set section's option to value.
"""
self.userCfg[configType].SetOption(section, option, value)
@ -380,7 +378,7 @@ class IdleConf:
(element, themeName, theme[element]))
try:
sys.stderr.write(warning)
except IOError:
except OSError:
pass
colour=cfgParser.Get(themeName,element,default=theme[element])
theme[element]=colour
@ -637,13 +635,11 @@ class IdleConf:
(event, keySetName, keyBindings[event]))
try:
sys.stderr.write(warning)
except IOError:
except OSError:
pass
return keyBindings
def GetExtraHelpSourceList(self,configSet):
"""Fetch list of extra help sources from a given configSet.
Valid configSets are 'user' or 'default'. Return a list of tuples of
the form (menu_item , path_to_help_file , option), or return the empty
list. 'option' is the sequence number of the help resource. 'option'

2
Lib/idlelib/rpc.py
View File

@ -339,7 +339,7 @@ class SocketIO(object):
r, w, x = select.select([], [self.sock], [])
n = self.sock.send(s[:BUFSIZE])
except (AttributeError, TypeError):
raise IOError("socket no longer exists")
raise OSError("socket no longer exists")
except socket.error:
raise
else:

2
Lib/idlelib/textView.py
View File

@ -66,7 +66,7 @@ def view_file(parent, title, filename, encoding=None, modal=True):
try:
with open(filename, 'r', encoding=encoding) as file:
contents = file.read()
except IOError:
except OSError:
import tkinter.messagebox as tkMessageBox
tkMessageBox.showerror(title='File Load Error',
message='Unable to load file %r .' % filename,