From a9065170d8eb9296db0df189713c18c0a4532b00 Mon Sep 17 00:00:00 2001
From: Jason Wilkes <notarealdeveloper@gmail.com>
Date: Tue, 1 Feb 2022 11:17:15 -0800
Subject: [PATCH 1/2] Change os.rename to shutil.move in import_helper.py

os.rename fails if the source and target live on different
devices. This can occur in Lib/test/support/import_helper.py
(for example) if /tmp is mounted as a ramdisk, or more
generally if PYTHONPYCACHEPREFIX is set to a directory
on a different drive from where temporary files are stored.
---
 Lib/test/support/import_helper.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Lib/test/support/import_helper.py b/Lib/test/support/import_helper.py
index 9bce29895249ae..5201dc84cf6df4 100644
--- a/Lib/test/support/import_helper.py
+++ b/Lib/test/support/import_helper.py
@@ -3,6 +3,7 @@
 import importlib
 import importlib.util
 import os
+import shutil
 import sys
 import unittest
 import warnings
@@ -59,7 +60,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
 
 

From dcb4402e0ab405e9a2083a60e04bb6b735d6e8f2 Mon Sep 17 00:00:00 2001
From: Jason Wilkes <notarealdeveloper@gmail.com>
Date: Mon, 7 Feb 2022 12:40:58 -0800
Subject: [PATCH 2/2] Add NEWS.d entry.

---
 .../NEWS.d/next/Tests/2022-02-07-12-40-45.bpo-46678.zfOrgL.rst | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 Misc/NEWS.d/next/Tests/2022-02-07-12-40-45.bpo-46678.zfOrgL.rst

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.