From bc079eefef860a0f6f6593c1e839fca973268349 Mon Sep 17 00:00:00 2001 From: Jacek Duszenko Date: Wed, 18 Sep 2024 17:43:11 +0200 Subject: [PATCH 1/4] fix invalid variable name in test_venv.py --- Lib/test/test_venv.py | 15 +++++++++++++++ Lib/venv/__init__.py | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py index b9fcc59d49668c..36ecb034f2d556 100644 --- a/Lib/test/test_venv.py +++ b/Lib/test/test_venv.py @@ -504,6 +504,21 @@ def test_unicode_in_batch_file(self): ) self.assertEqual(out.strip(), '0') + @unittest.skipUnless(os.name == 'nt' and can_symlink(), + 'symlinks on Windows') + def test_failed_symlink(self): + """ + Test handling of failed symlinks on Windows. + """ + rmtree(self.env_dir) + env_dir = os.path.join(os.path.realpath(self.env_dir), 'venv') + with patch('os.symlink') as mock_symlink: + mock_symlink.side_effect = OSError() + builder = venv.EnvBuilder(clear=True, symlinks=True) + _, err = self.run_with_capture(builder.create, env_dir) + filepath_regex = r"'.+\/[^\/]+'" + self.assertRegex(err, rf"Unable to symlink {filepath_regex} to {filepath_regex}",) + @requireVenvCreate def test_multiprocessing(self): """ diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py index fa69d5846f2fa7..028e9483196694 100644 --- a/Lib/venv/__init__.py +++ b/Lib/venv/__init__.py @@ -393,7 +393,7 @@ def setup_python(self, context): os.symlink(src, dest) to_unlink.append(dest) except OSError: - logger.warning('Unable to symlink %r to %r', src, dst) + logger.warning('Unable to symlink %r to %r', src, dest) do_copies = True for f in to_unlink: try: From f3236d504eb9f6a11bf06c40ff4d13f099638c78 Mon Sep 17 00:00:00 2001 From: Jacek Duszenko Date: Wed, 18 Sep 2024 19:41:36 +0200 Subject: [PATCH 2/4] fix test case --- Lib/test/test_venv.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py index 36ecb034f2d556..1ef08da326c18c 100644 --- a/Lib/test/test_venv.py +++ b/Lib/test/test_venv.py @@ -516,8 +516,8 @@ def test_failed_symlink(self): mock_symlink.side_effect = OSError() builder = venv.EnvBuilder(clear=True, symlinks=True) _, err = self.run_with_capture(builder.create, env_dir) - filepath_regex = r"'.+\/[^\/]+'" - self.assertRegex(err, rf"Unable to symlink {filepath_regex} to {filepath_regex}",) + filepath_regex = r"'[A-Z]:\\\\(?:[^\\\\]+\\\\)*[^\\\\]+'" + self.assertRegex(err, rf"Unable to symlink {filepath_regex} to {filepath_regex}") @requireVenvCreate def test_multiprocessing(self): From f4b574fa4f60b63503f410fc96a04af98eba5142 Mon Sep 17 00:00:00 2001 From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 17:45:53 +0000 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?= =?UTF-8?q?rb=5Fit.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../next/Library/2024-09-18-17-45-52.gh-issue-124212.n6kIby.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Library/2024-09-18-17-45-52.gh-issue-124212.n6kIby.rst diff --git a/Misc/NEWS.d/next/Library/2024-09-18-17-45-52.gh-issue-124212.n6kIby.rst b/Misc/NEWS.d/next/Library/2024-09-18-17-45-52.gh-issue-124212.n6kIby.rst new file mode 100644 index 00000000000000..78c1aa9374ac31 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2024-09-18-17-45-52.gh-issue-124212.n6kIby.rst @@ -0,0 +1 @@ +Fix invalid variable in ``venv`` handling of failed symlink on Windows From d8ea2d300cf7f35ac03ca486d665681274ecf5d3 Mon Sep 17 00:00:00 2001 From: Jacek Date: Wed, 18 Sep 2024 21:16:05 +0200 Subject: [PATCH 4/4] Update Misc/NEWS.d/next/Library/2024-09-18-17-45-52.gh-issue-124212.n6kIby.rst Co-authored-by: Kirill Podoprigora --- .../next/Library/2024-09-18-17-45-52.gh-issue-124212.n6kIby.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Misc/NEWS.d/next/Library/2024-09-18-17-45-52.gh-issue-124212.n6kIby.rst b/Misc/NEWS.d/next/Library/2024-09-18-17-45-52.gh-issue-124212.n6kIby.rst index 78c1aa9374ac31..7848f26511e282 100644 --- a/Misc/NEWS.d/next/Library/2024-09-18-17-45-52.gh-issue-124212.n6kIby.rst +++ b/Misc/NEWS.d/next/Library/2024-09-18-17-45-52.gh-issue-124212.n6kIby.rst @@ -1 +1 @@ -Fix invalid variable in ``venv`` handling of failed symlink on Windows +Fix invalid variable in :mod:`venv` handling of failed symlink on Windows