From: Steve Dower Date: Wed, 5 Aug 2015 18:34:50 +0000 (-0700) Subject: Fixes make_zip.py to create temporary .pyc files in a separate directory. This avoids... X-Git-Tag: v3.5.0rc1~25 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=315b748cfc5d64d606d12a73ac81051da32419c3;p=thirdparty%2FPython%2Fcpython.git Fixes make_zip.py to create temporary .pyc files in a separate directory. This avoids polluting tests that run code from TEMP. --- diff --git a/Tools/msi/make_zip.py b/Tools/msi/make_zip.py index bace19a2be3c..ba711c484a9b 100644 --- a/Tools/msi/make_zip.py +++ b/Tools/msi/make_zip.py @@ -82,18 +82,19 @@ def copy_to_layout(target, rel_sources): target.unlink() with ZipFile(str(target), 'w', ZIP_DEFLATED) as f: - for s, rel in rel_sources: - if rel.suffix.lower() == '.py': - pyc = Path(tempfile.gettempdir()) / rel.with_suffix('.pyc').name - try: - py_compile.compile(str(s), str(pyc), str(rel), doraise=True, optimize=2) - except py_compile.PyCompileError: - f.write(str(s), str(rel)) + with tempfile.TemporaryDirectory() as tmpdir: + for s, rel in rel_sources: + if rel.suffix.lower() == '.py': + pyc = Path(tmpdir) / rel.with_suffix('.pyc').name + try: + py_compile.compile(str(s), str(pyc), str(rel), doraise=True, optimize=2) + except py_compile.PyCompileError: + f.write(str(s), str(rel)) + else: + f.write(str(pyc), str(rel.with_suffix('.pyc'))) else: - f.write(str(pyc), str(rel.with_suffix('.pyc'))) - else: - f.write(str(s), str(rel)) - count += 1 + f.write(str(s), str(rel)) + count += 1 else: for s, rel in rel_sources: