From fee0a28ab8169fd41e7cfe22a0a654ad923350b6 Mon Sep 17 00:00:00 2001 From: Jason Wilkes Date: Mon, 7 Feb 2022 17:09:07 -0800 Subject: [PATCH] bpo-46678: Fix Invalid cross device link in Lib/test/support/import_helper.py (GH-31204) In [Lib/test/support/import_helper.py](https://github.com/python/cpython/blob/master/Lib/test/support/import_helper.py), the function `make_legacy_pyc` makes a call to `os.rename` which can fail when the source and target live on different devices. This happens (for example) when `PYTHONPYCACHEPREFIX` is set to a directory anywhere on disk, while a ramdisk is mounted on `/tmp` (the latter of which is the default on various Linux distros). Replacing `os.rename` with `shutil.move` fixes this. Automerge-Triggered-By: GH:brettcannon (cherry picked from commit da576e08296490e94924421af71001bcfbccb317) Co-authored-by: Jason Wilkes --- Lib/test/support/import_helper.py | 3 ++- .../NEWS.d/next/Tests/2022-02-07-12-40-45.bpo-46678.zfOrgL.rst | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Tests/2022-02-07-12-40-45.bpo-46678.zfOrgL.rst diff --git a/Lib/test/support/import_helper.py b/Lib/test/support/import_helper.py index 43ae31483420de..efa8ffad6a8e0b 100644 --- a/Lib/test/support/import_helper.py +++ b/Lib/test/support/import_helper.py @@ -2,6 +2,7 @@ import importlib import importlib.util import os +import shutil import sys import unittest import warnings @@ -58,7 +59,7 @@ def make_legacy_pyc(source): pyc_file = importlib.util.cache_from_source(source) up_one = os.path.dirname(os.path.abspath(source)) legacy_pyc = os.path.join(up_one, source + 'c') - os.rename(pyc_file, legacy_pyc) + shutil.move(pyc_file, legacy_pyc) return legacy_pyc diff --git a/Misc/NEWS.d/next/Tests/2022-02-07-12-40-45.bpo-46678.zfOrgL.rst b/Misc/NEWS.d/next/Tests/2022-02-07-12-40-45.bpo-46678.zfOrgL.rst new file mode 100644 index 00000000000000..e369cb1f67baf7 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2022-02-07-12-40-45.bpo-46678.zfOrgL.rst @@ -0,0 +1,3 @@ +The function ``make_legacy_pyc`` in ``Lib/test/support/import_helper.py`` no +longer fails when ``PYTHONPYCACHEPREFIX`` is set to a directory on a +different device from where tempfiles are stored.