p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

assertion: rewrite: only catch EnvironmentError 

This was changed unintentionally in 45c4a8fb3 (pytest 5.3.0), but only
EnvironmentErrors might have `errno`.
Since that is not really guaranteed and it is good to have more
information this uses the string representation of the exc in the trace
message.
This commit is contained in:
Daniel Hahler 2020-02-25 17:24:07 +01:00
parent 6a7df7f031
commit eac933acde
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/_pytest/assertion/rewrite.py
View File

@ -276,7 +276,7 @@ if sys.platform == "win32":
with atomic_write(fspath(pyc), mode="wb", overwrite=True) as fp: with atomic_write(fspath(pyc), mode="wb", overwrite=True) as fp:
_write_pyc_fp(fp, source_stat, co) _write_pyc_fp(fp, source_stat, co)
except EnvironmentError as e: except EnvironmentError as e:
state.trace("error writing pyc file at {}: errno={}".format(pyc, e.errno)) state.trace("error writing pyc file at {}: {}".format(pyc, e))
# we ignore any failure to write the cache file # we ignore any failure to write the cache file
# there are many reasons, permission-denied, pycache dir being a # there are many reasons, permission-denied, pycache dir being a
# file etc. # file etc.
@ -299,8 +299,8 @@ else:
try: try:
_write_pyc_fp(fp, source_stat, co) _write_pyc_fp(fp, source_stat, co)
os.rename(proc_pyc, fspath(pyc)) os.rename(proc_pyc, fspath(pyc))
except BaseException as e: except EnvironmentError as e:
state.trace("error writing pyc file at {}: errno={}".format(pyc, e.errno)) state.trace("error writing pyc file at {}: {}".format(pyc, e))
# we ignore any failure to write the cache file # we ignore any failure to write the cache file
# there are many reasons, permission-denied, pycache dir being a # there are many reasons, permission-denied, pycache dir being a
# file etc. # file etc.