mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #16706: get rid of os.error

Browse source
This commit is contained in:
Andrew Svetlov 2012-12-18 22:02:39 +02:00
parent a191959849
commit ad28c7f9da
33 changed files with 4089 additions and 4123 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/lib2to3/main.py
View file

@ -90,11 +90,11 @@ class StdoutRefactoringTool(refactor.MultiprocessRefactoringTool):
if os.path.lexists(backup):
try:
os.remove(backup)
except os.error as err:
except OSError as err:
self.log_message("Can't remove backup %s", backup)
try:
os.rename(filename, backup)
except os.error as err:
except OSError as err:
self.log_message("Can't rename %s to %s", filename, backup)
# Actually write the new file
write = super(StdoutRefactoringTool, self).write_file

4
Lib/lib2to3/refactor.py
View file

@ -534,12 +534,12 @@ class RefactoringTool(object):
"""
try:
f = _open_with_encoding(filename, "w", encoding=encoding)
except os.error as err:
except OSError as err:
self.log_error("Can't create %s: %s", filename, err)
return
try:
f.write(_to_system_newlines(new_text))
except os.error as err:
except OSError as err:
self.log_error("Can't write %s: %s", filename, err)
finally:
f.close()

2
Lib/lib2to3/tests/pytree_idempotency.py
View file

@ -53,7 +53,7 @@ def main():
for dir in sys.path:
try:
names = os.listdir(dir)
except os.error:
except OSError:
continue
print("Scanning", dir, "...", file=sys.stderr)
for name in names: