floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3509 from nicoddemus/marshal-3503 

Write rewritten code using file.write(marshal.dumps())
This commit is contained in:
Bruno Oliveira 2018-05-25 21:24:45 -03:00 committed by GitHub
parent a36bab448f b5a94d8e6c
commit 1d451c786d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
_pytest/assertion/rewrite.py
View File

@ -267,10 +267,7 @@ def _write_pyc(state, co, source_stat, pyc):
mtime = int(source_stat.mtime) mtime = int(source_stat.mtime)
size = source_stat.size & 0xFFFFFFFF size = source_stat.size & 0xFFFFFFFF
fp.write(struct.pack("<ll", mtime, size)) fp.write(struct.pack("<ll", mtime, size))
if six.PY2: fp.write(marshal.dumps(co))
marshal.dump(co, fp.file)
else:
marshal.dump(co, fp)
except EnvironmentError as e: except EnvironmentError as e:
state.trace("error writing pyc file at %s: errno=%s" % (pyc, e.errno)) state.trace("error writing pyc file at %s: errno=%s" % (pyc, e.errno))
# we ignore any failure to write the cache file # we ignore any failure to write the cache file

1
changelog/3503.bugfix.rst Normal file
View File

@ -0,0 +1 @@
Fix assertion rewriter compatibility with libraries that monkey patch ``file`` objects.