10000 Replace IOError with OSError (#16715) · python/cpython@f7a17b4 · GitHub
[go: up one dir, main page]
Skip to content

Commit f7a17b4

Browse files
asvetlovasvetlov
committed
Replace IOError with OSError (#16715)
1 parent 16bdd41 commit f7a17b4

File tree

121 files changed

+381
-386
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+381
-386
lines changed

‎Lib/_osx_support.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def _get_system_version():
9494
_SYSTEM_VERSION = ''
9595
try:
9696
f = open('/System/Library/CoreServices/SystemVersion.plist')
97-
except IOError:
97+
except OSError:
9898
# We're on a plain darwin box, fall back to the default
9999
# behaviour.
100100
pass

‎Lib/_pyio.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
def open(file, mode="r", buffering=-1, encoding=None, errors=None,
3535
newline=None, closefd=True, opener=None):
3636

37-
r"""Open file and return a stream. Raise IOError upon failure.
37+
r"""Open file and return a stream. Raise OSError upon failure.
3838
3939
file is either a text or byte string giving the name (and the path
4040
if the file isn't in the current working directory) of the file to
@@ -254,7 +254,7 @@ def __new__(cls, *args, **kwargs):
254254
try:
255255
UnsupportedOperation = io.UnsupportedOperation
256256
except AttributeError:
257-
class UnsupportedOperation(ValueError, IOError):
257+
class UnsupportedOperation(ValueError, OSError):
258258
pass
259259

260260

@@ -278,7 +278,7 @@ class IOBase(metaclass=abc.ABCMeta):
278278
readinto) needed. Text I/O classes work with str data.
279279
280280
Note that calling any method (even inquiries) on a closed stream is
281-
undefined. Implementations may raise IOError in this case.
281+
undefined. Implementations may raise OSError in this case.
282282
283283
IOBase (and its subclasses) support the iterator protocol, meaning
284284
that an IOBase object can be iterated over yielding the lines in a
@@ -294,7 +294,7 @@ class IOBase(metaclass=abc.ABCMeta):
294294
### Internal ###
295295

296296
def _unsupported(self, name):
297-
"""Internal: raise an IOError exception for unsupported operations."""
297+
"""Internal: raise an OSError exception for unsupported operations."""
298298
raise UnsupportedOperation("%s.%s() not supported" %
299299
(self.__class__.__name__, name))
300300

@@ -441,7 +441,7 @@ def __exit__(self, *args):
441441
def fileno(self):
442442
"""Returns underlying file descriptor (an int) if one exists.
443443
444-
An IOError is raised if the IO object does not use a file descriptor.
444+
An OSError is raised if the IO object does not use a file descriptor.
445445
"""
446446
self._unsupported("fileno")
447447

@@ -699,13 +699,13 @@ def __init__(self, raw):
699699
def seek(self, pos, whence=0):
700700
new_position = self.raw.seek(pos, whence)
701701
if new_position < 0:
702-
raise IOError("seek() returned an invalid position")
702+
raise OSError("seek() returned an invalid position")
703703
return new_position
704704

705705
def tell(self):
706706
pos = self.raw.tell()
707707
if pos < 0:
708-
raise IOError("tell() returned an invalid position")
708+
raise OSError("tell() returned an invalid position")
709709
return pos
710710

711711
def truncate(self, pos=None):
@@ -927,7 +927,7 @@ def __init__(self, raw, buffer_size=DEFAULT_BUFFER_SIZE):
927927
"""Create a new buffered reader using the given readable raw IO object.
928928
"""
929929
if not raw.readable():
930-
raise IOError('"raw" argument must be readable.')
930+
raise OSError('"raw" argument must be readable.')
931931

932932
_BufferedIOMixin.__init__(self, raw)
933933
if buffer_size <= 0:
@@ -1074,7 +1074,7 @@ class BufferedWriter(_BufferedIOMixin):
10741074

10751075
def __init__(self, raw, buffer_size=DEFAULT_BUFFER_SIZE):
10761076
if not raw.writable():
1077-
raise IOError('"raw" argument must be writable.')
1077+
raise OSError('"raw" argument must be writable.')
10781078

10791079
_BufferedIOMixin.__init__(self, raw)
10801080
if buffer_size <= 0:
@@ -1138,7 +1138,7 @@ def _flush_unlocked(self):
11381138
errno.EAGAIN,
11391139
"write could not complete without blocking", 0)
11401140
if n > len(self._write_buf) or n < 0:
1141-
raise IOError("write() returned incorrect number of bytes")
1141+
raise OSError("write() returned incorrect number of bytes")
11421142
del self._write_buf[:n]
11431143

11441144
def tell(self):
@@ -1174,10 +1174,10 @@ def __init__(self, reader, writer, buffer_size=DEFAULT_BUFFER_SIZE):
11741174
The arguments are two RawIO instances.
11751175
"""
11761176
if not reader.readable():
1177-
raise IOError('"reader" argument must be readable.')
1177+
raise OSError('"reader" argument must be readable.')
11781178

11791179
if not writer.writable():
1180-
raise IOError('"writer" argument must be writable.')
1180+
raise OSError('"writer" argument must be writable.')
11811181

11821182
self.reader = BufferedReader(reader, buffer_size)
11831183
self.writer = BufferedWriter(writer, buffer_size)
@@ -1248,7 +1248,7 @@ def seek(self, pos, whence=0):
12481248
with self._read_lock:
12491249
self._reset_read_buf()
12501250
if pos < 0:
1251-
raise IOError("seek() returned invalid position")
1251+
raise OSError("seek() returned invalid position")
12521252
return pos
12531253

12541254
def tell(self):
@@ -1727,7 +1727,7 @@ def tell(self):
17271727
if not self._seekable:
17281728
raise UnsupportedOperation("underlying stream is not seekable")
17291729
if not self._telling:
1730-
raise IOError("telling position disabled by next() call")
1730+
raise OSError("telling position disabled by next() call")
17311731
self.flush()
17321732
position = self.buffer.tell()
17331733
decoder = self._decoder
@@ -1814,7 +1814,7 @@ def tell(self):
18141814
chars_decoded += len(decoder.decode(b'', final=True))
18151815
need_eof = 1
18161816
if chars_decoded < chars_to_skip:
1817-
raise IOError("can't reconstruct logical file position")
1817+
raise OSError("can't reconstruct logical file position")
18181818

18191819
# The returned cookie corresponds to the last safe start point.
18201820
return self._pack_cookie(
@@ -1891,7 +1891,7 @@ def seek(self, cookie, whence=0):
18911891

18921892
# Skip chars_to_skip of the decoded characters.
18931893
if len(self._decoded_chars) < chars_to_skip:
1894-
raise IOError("can't restore logical file position")
1894+
raise OSError("can't restore logical file position")
18951895
self._decoded_chars_used = chars_to_skip
18961896

18971897
# Finally, reset the encoder (merely useful for proper BOM handling)

‎Lib/argparse.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,7 @@ def __call__(self, string):
11671167
try:
11681168
return open(string, self._mode, self._bufsize, self._encoding,
11691169
self._errors)
1170-
except IOError as e:
1170+
except OSError as e:
11711171
message = _("can't open '%s': %s")
11721172
raise ArgumentTypeError(message % (string, e))
11731173

@@ -2020,7 +2020,7 @@ def _read_args_from_files(self, arg_strings):
20202020
new_arg_strings.extend(arg_strings)
20212021
finally:
20222022
args_file.close()
2023-
except IOError:
2023+
except OSError:
20242024
err = _sys.exc_info()[1]
20252025
self.error(str(err))
20262026

‎Lib/cgi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def initlog(*allargs):
8080
if logfile and not logfp:
8181
try:
8282
logfp = open(logfile, "a")
83-
except IOError:
83+
except OSError:
8484
pass
8585
if not logfp:
8686
log = nolog

‎Lib/chunk.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def __init__(self, file, align=True, bigendian=True, inclheader=False):
7070
self.size_read = 0
7171
try:
7272
self.offset = self.file.tell()
73-
except (AttributeError, IOError):
73+
except (AttributeError, OSError):
7474
self.seekable = False
7575
else:
7676
self.seekable = True
@@ -102,7 +102,7 @@ def seek(self, pos, whence=0):
102102
if self.closed:
103103
raise ValueError("I/O operation on closed file")
104104
if not self.seekable:
105-
raise IOError("cannot seek")
105+
raise OSError("cannot seek")
106106
if whence == 1:
107107
pos = pos + self.size_read
108108
elif whence == 2:
@@ -158,7 +158,7 @@ def skip(self):
158158
self.file.seek(n, 1)
159159
self.size_read = self.size_read + n
160160
return
161-
except IOError:
161+
except OSError:
162162
pass
163163
while self.size_read < self.chunksize:
164164
n = min(8192, self.chunksize - self.size_read)

‎Lib/compileall.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def compile_file(fullname, ddir=None, force=False, rx=None, quiet=False,
106106
actual = chandle.read(8)
107107
if expect == actual:
108108
return success
109-
except IOError:
109+
except OSError:
110110
pass
111111
if not quiet:
112112
print('Compiling {!r}...'.format(fullname))
@@ -124,7 +124,7 @@ def compile_file(fullname, ddir=None, force=False, rx=None, quiet=False,
124124
msg = msg.decode(sys.stdout.encoding)
125125
print(msg)
126126
success = 0
127-
except (SyntaxError, UnicodeError, IOError) as e:
127+
except (SyntaxError, UnicodeError, OSError) as e:
128128
if quiet:
129129
print('*** Error compiling {!r}...'.format(fullname))
130130
else:

‎Lib/configparser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ def read(self, filenames, encoding=None):
688688
try:
689689
with open(filename, encoding=encoding) as fp:
690690
self._read(fp, filename)
691-
except IOError:
691+
except OSError:
692692
continue
693693
read_ok.append(filename)
694694
return read_ok

‎Lib/dbm/__init__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class error(Exception):
4242
_defaultmod = None
4343
_modules = {}
4444

45-
error = (error, IOError)
45+
error = (error, OSError)
4646

4747

4848
def open(file, flag='r', mode=0o666):
@@ -109,7 +109,7 @@ def whichdb(filename):
109109
f = io.open(filename + ".dir", "rb")
110110
f.close()
111111
return "dbm.ndbm"
112-
except IOError:
112+
except OSError:
113113
# some dbm emulations based on Berkeley DB generate a .db file
114114
# some do not, but they should be caught by the bsd checks
115115
try:
@@ -122,7 +122,7 @@ def whichdb(filename):
122122
d = ndbm.open(filename)
123123
d.close()
124124
return "dbm.ndbm"
125-
except IOError:
125+
except OSError:
126126
pass
127127

128128
# Check for dumbdbm next -- this has a .dir and a .dat file
@@ -139,13 +139,13 @@ def whichdb(filename):
139139
return "dbm.dumb"
140140
finally:
141141
f.close()
142-
except (OSError, IOError):
142+
except OSError:
143143
pass
144144

145145
# See if the file exists, return None if not
146146
try:
147147
f = io.open(filename, "rb")
148-
except IOError:
148+
except OSError:
149149
return None
150150

151151
# Read the start of the file -- the magic number

‎Lib/dbm/dumb.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
_BLOCKSIZE = 512
3131

32-
error = IOError
32+
error = OSError
3333

3434
class _Database(collections.MutableMapping):
3535

@@ -67,7 +67,7 @@ def __init__(self, filebasename, mode):
6767
# Mod by Jack: create data file if needed
6868
try:
6969
f = _io.open(self._datfile, 'r', encoding="Latin-1")
70-
except IOError:
70+
except OSError:
7171
f = _io.open(self._datfile, 'w', encoding="Latin-1")
7272
self._chmod(self._datfile)
7373
f.close()
@@ -78,7 +78,7 @@ def _update(self):
7878
self._index = {}
7979
try:
8080
f = _io.open(self._dirfile, 'r', encoding="Latin-1")
81-
except IOError:
81+
except OSError:
8282
pass
8383
else:
8484
for line in f:

‎Lib/distutils/command/build_scripts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def copy_scripts(self):
7474
# script.
7575
try:
7676
f = open(script, "rb")
77-
except IOError:
77+
except OSError:
7878
if not self.dry_run:
7979
raise
8080
f = None

‎Lib/distutils/core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ class found in 'cmdclass' is used in place of the default, which is
148148
dist.run_commands()
149149
except KeyboardInterrupt:
150150
raise SystemExit("interrupted")
151-
except (IOError, OSError) as exc:
151+
except OSError as exc:
152152
error = grok_environment_error(exc)
153153

154154
if DEBUG:

‎Lib/distutils/cygwinccompiler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ def check_config_h():
359359
return CONFIG_H_NOTOK, "'%s' does not mention '__GNUC__'" % fn
360360
finally:
361361
config_h.close()
362-
except IOError as exc:
362+
except OSError as exc:
363363
return (CONFIG_H_UNCERTAIN,
364364
"couldn't read '%s': %s" % (fn, exc.strerror))
365365

‎Lib/distutils/dir_util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ def remove_tree(directory, verbose=1, dry_run=0):
198198
abspath = os.path.abspath(cmd[1])
199199
if abspath in _path_created:
200200
del _path_created[abspath]
201-
except (IOError, OSError) as exc:
201+
except OSError as exc:
202202
log.warn(grok_environment_error(
203203
exc, "error removing %s: " % directory))
204204

‎Lib/distutils/errors.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ class DistutilsArgError (DistutilsError):
3535

3636
class DistutilsFileError (DistutilsError):
3737
"""Any problems in the filesystem: expected file not found, etc.
38-
Typically this is for problems that we detect before IOError or
39-
OSError could be raised."""
38+
Typically this is for problems that we detect before OSError
39+
could be raised."""
4040
pass
4141

4242
class DistutilsOptionError (DistutilsError):

‎Lib/distutils/msvc9compiler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ def _remove_visual_c_ref(self, manifest_file):
729729
return manifest_file
730730
finally:
731731
manifest_f.close()
732-
except IOError:
732+
except OSError:
733733
pass
734734

735735
# -- Miscellaneous methods -----------------------------------------

‎Lib/distutils/sysconfig.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ def _init_posix():
426426
try:
427427
filename = get_makefile_filename()
428428
parse_makefile(filename, g)
429-
except IOError as msg:
429+
except OSError as msg:
430430
my_msg = "invalid Python installation: unable to open %s" % filename
431431
if hasattr(msg, "strerror"):
432432
my_msg = my_msg + " (%s)" % msg.strerror
@@ -438,7 +438,7 @@ def _init_posix():
438438
filename = get_config_h_filename()
439439
with open(filename) as file:
440440
parse_config_h(file, g)
441-
except IOError as msg:
441+
except OSError as msg:
442442
my_msg = "invalid Python installation: unable to open %s" % filename
443443
if hasattr(msg, "strerror"):
444444
my_msg = my_msg + " (%s)" % msg.strerror

‎Lib/distutils/util.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ def _subst (match, local_vars=local_vars):
207207

208208

209209
def grok_environment_error (exc, prefix="error: "):
210-
"""Generate a useful error message from an EnvironmentError (IOError or
211-
OSError) exception object. Handles Python 1.5.1 and 1.5.2 styles, and
210+
"""Generate a useful error message from an OSError
211+
exception object. Handles Python 1.5.1 and 1.5.2 styles, and
212212
does what it can to deal with exception objects that don't have a
213213
filename (which happens when the error is due to a two-file operation,
214214
such as 'rename()' or 'link()'. Returns the error message as a string

0 commit comments

Comments
 (0)
0