diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2022-02-08 21:04:05 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-08 21:04:05 (GMT) |
| commit | c2735b75afd530631efde4ddd3cb24bbdc285559 (patch) | |
| tree | a5708aa6ee2cf54382abb5f02eefbf9f65163702 /Lib/test | |
| parent | 5b58db75291cfbb9b6785c9845824b3e2da01c1c (diff) | |
| download | cpython-c2735b75afd530631efde4ddd3cb24bbdc285559.zip cpython-c2735b75afd530631efde4ddd3cb24bbdc285559.tar.gz cpython-c2735b75afd530631efde4ddd3cb24bbdc285559.tar.bz2 | |
bpo-46678: Fix Invalid cross device link in Lib/test/support/import_helper.py (GH-31204) (GH-31207)
In `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 <notarealdeveloper@gmail.com>
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/support/import_helper.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/support/import_helper.py b/Lib/test/support/import_helper.py index 43ae314..efa8ffa 100644 --- a/Lib/test/support/import_helper.py +++ b/Lib/test/support/import_helper.py @@ -2,6 +2,7 @@ import contextlib 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 |