Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ba6c0d3

Browse files
terryjreedyterryjreedy
committed
#18151, part 1: Backport idlelilb portion of Andrew Svetlov's 3.4 patch
changing IOError to OSError (#16715).
1 parent 50793b4 commit ba6c0d3

8 files changed

Lines changed: 18 additions & 22 deletions

File tree

‎Lib/idlelib/EditorWindow.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,7 @@ def update_recent_files_list(self, new_file=None):
901901
with open(self.recent_files_path, 'w',
902902
encoding='utf_8', errors='replace') as rf_file:
903903
rf_file.writelines(rf_list)
904-
except IOError as err:
904+
except OSError as err:
905905
if not getattr(self.root, "recentfilelist_error_displayed", False):
906906
self.root.recentfilelist_error_displayed = True
907907
tkMessageBox.showerror(title='IDLE Error',

‎Lib/idlelib/GrepDialog.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def grep_it(self, prog, path):
8282
for fn in list:
8383
try:
8484
f = open(fn, errors='replace')
85-
except IOError as msg:
85+
except OSError as msg:
8686
print(msg)
8787
continue
8888
lineno = 0

‎Lib/idlelib/IOBinding.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ def loadfile(self, filename):
213213
f.seek(0)
214214
bytes = f.read()
215215
f.close()
216-
except IOError as msg:
216+
except OSError as msg:
217217
tkMessageBox.showerror("I/O Error", str(msg), master=self.text)
218218
return False
219219
chars, converted = self._decode(two_lines, bytes)
@@ -378,7 +378,7 @@ def writefile(self, filename):
378378
f.flush()
379379
f.close()
380380
return True
381-
except IOError as msg:
381+
except OSError as msg:
382382
tkMessageBox.showerror("I/O Error", str(msg),
383383
master=self.text)
384384
return False

‎Lib/idlelib/OutputWindow.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def _file_line_helper(self, line):
106106
f = open(filename, "r")
107107
f.close()
108108
break
109-
except IOError:
109+
except OSError:
110110
continue
111111
else:
112112
return None

‎Lib/idlelib/PyShell.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def idle_showwarning(message, category, filename, lineno,
5959
try:
6060
file.write(warnings.formatwarning(message, category, filename,
6161
lineno, line=line))
62-
except IOError:
62+
except OSError:
6363
pass ## file (probably __stderr__) is invalid, warning dropped.
6464
warnings.showwarning = idle_showwarning
6565
def idle_formatwarning(message, category, filename, lineno, line=None):
@@ -213,7 +213,7 @@ def store_file_breaks(self):
213213
try:
214214
with open(self.breakpointPath, "r") as fp:
215215
lines = fp.readlines()
216-
except IOError:
216+
except OSError:
217217
lines = []
218218
try:
219219
with open(self.breakpointPath, "w") as new_file:
@@ -224,7 +224,7 @@ def store_file_breaks(self):
224224
breaks = self.breakpoints
225225
if breaks:
226226
new_file.write(filename + '=' + str(breaks) + '\n')
227-
except IOError as err:
227+
except OSError as err:
228228
if not getattr(self.root, "breakpoint_error_displayed", False):
229229
self.root.breakpoint_error_displayed = True
230230
tkMessageBox.showerror(title='IDLE Error',
@@ -532,7 +532,7 @@ def poll_subprocess(self):
532532
return
533533
try:
534534
response = clt.pollresponse(self.active_seq, wait=0.05)
535-
except (EOFError, IOError, KeyboardInterrupt):
535+
except (EOFError, OSError, KeyboardInterrupt):
536536
# lost connection or subprocess terminated itself, restart
537537
# [the KBI is from rpc.SocketIO.handle_EOF()]
538538
if self.tkconsole.closing:

‎Lib/idlelib/configHandler.py‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ def Save(self):
142142
fname = self.file
143143
try:
144144
cfgFile = open(fname, 'w')
145-
except IOError:
145+
except OSError:
146146
os.unlink(fname)
147147
cfgFile = open(fname, 'w')
148148
with cfgFile:
@@ -207,7 +207,7 @@ def GetUserCfgDir(self):
207207
userDir+',\n but the path does not exist.\n')
208208
try:
209209
sys.stderr.write(warn)
210-
except IOError:
210+
except OSError:
211211
pass
212212
userDir = '~'
213213
if userDir == "~": # still no path to home!
@@ -217,7 +217,7 @@ def GetUserCfgDir(self):
217217
if not os.path.exists(userDir):
218218
try:
219219
os.mkdir(userDir)
220-
except (OSError, IOError):
220+
except OSError:
221221
warn = ('\n Warning: unable to create user config directory\n'+
222222
userDir+'\n Check path and permissions.\n Exiting!\n\n')
223223
sys.stderr.write(warn)
@@ -251,7 +251,7 @@ def GetOption(self, configType, section, option, default=None, type=None,
251251
raw=raw)))
252252
try:
253253
sys.stderr.write(warning)
254-
except IOError:
254+
except OSError:
255255
pass
256256
try:
257257
if self.defaultCfg[configType].has_option(section,option):
@@ -268,13 +268,11 @@ def GetOption(self, configType, section, option, default=None, type=None,
268268
(option, section, default))
269269
try:
270270
sys.stderr.write(warning)
271-
except IOError:
271+
except OSError:
272272
pass
273273
return default
274-
275274
def SetOption(self, configType, section, option, value):
276275
"""In user's config file, set section's option to value.
277-
278276
"""
279277
self.userCfg[configType].SetOption(section, option, value)
280278

@@ -380,7 +378,7 @@ def GetThemeDict(self,type,themeName):
380378
(element, themeName, theme[element]))
381379
try:
382380
sys.stderr.write(warning)
383-
except IOError:
381+
except OSError:
384382
pass
385383
colour=cfgParser.Get(themeName,element,default=theme[element])
386384
theme[element]=colour
@@ -637,13 +635,11 @@ def GetCoreKeys(self, keySetName=None):
637635
(event, keySetName, keyBindings[event]))
638636
try:
639637
sys.stderr.write(warning)
640-
except IOError:
638+
except OSError:
641639
pass
642640
return keyBindings
643-
644641
def GetExtraHelpSourceList(self,configSet):
645642
"""Fetch list of extra help sources from a given configSet.
646-
647643
Valid configSets are 'user' or 'default'. Return a list of tuples of
648644
the form (menu_item , path_to_help_file , option), or return the empty
649645
list. 'option' is the sequence number of the help resource. 'option'

‎Lib/idlelib/rpc.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ def putmessage(self, message):
339339
r, w, x = select.select([], [self.sock], [])
340340
n = self.sock.send(s[:BUFSIZE])
341341
except (AttributeError, TypeError):
342-
raise IOError("socket no longer exists")
342+
raise OSError("socket no longer exists")
343343
except socket.error:
344344
raise
345345
else:

‎Lib/idlelib/textView.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def view_file(parent, title, filename, encoding=None, modal=True):
6666
try:
6767
with open(filename, 'r', encoding=encoding) as file:
6868
contents = file.read()
69-
except IOError:
69+
except OSError:
7070
import tkinter.messagebox as tkMessageBox
7171
tkMessageBox.showerror(title='File Load Error',
7272
message='Unable to load file %r .' % filename,

0 commit comments

Comments
 (0)