From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 7 Jan 2026 07:21:45 +0000 (+0100)
Subject: [3.14] gh-75572: Fix test_xpickle and disable it by default (GH-143503) (GH-143505)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad53bf5fd7f6765a529e582bdea3b478037370dc;p=thirdparty%2FPython%2Fcpython.git

[3.14] gh-75572: Fix test_xpickle and disable it by default (GH-143503) (GH-143505)

(cherry picked from commit b866a1c73f81606475456dbe8a7620c225fdc718)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
---

diff --git a/Lib/test/test_xpickle.py b/Lib/test/test_xpickle.py
index 459944afd20e..659d3e383898 100644
--- a/Lib/test/test_xpickle.py
+++ b/Lib/test/test_xpickle.py
@@ -17,6 +17,8 @@ try:
 except ModuleNotFoundError:
     has_c_implementation = False
 
+support.requires('xpickle')
+
 is_windows = sys.platform.startswith('win')
 
 # Map python version to a tuple containing the name of a corresponding valid
diff --git a/Lib/test/xpickle_worker.py b/Lib/test/xpickle_worker.py
index 03191372bf7a..3fd957f4a0b9 100644
--- a/Lib/test/xpickle_worker.py
+++ b/Lib/test/xpickle_worker.py
@@ -12,6 +12,7 @@ test_mod_path = os.path.abspath(os.path.join(os.path.dirname(__file__),
 if sys.version_info >= (3, 5):
     import importlib.util
     spec = importlib.util.spec_from_file_location('test.picklecommon', test_mod_path)
+    sys.modules['test'] = type(sys)('test')
     test_module = importlib.util.module_from_spec(spec)
     spec.loader.exec_module(test_module)
     sys.modules['test.picklecommon'] = test_module