[3.13] pythongh-124212: Fix undefined variable in error message in venv (pythonGH-124211) (python#124226)

miss-islington · JacekDuszenko · web-flow · commit 32acfdb678e3 · 2024-09-29T18:11:22.000-07:00
pythongh-124212: Fix undefined variable in error message in venv (pythonGH-124211) (cherry picked from commit ea7fe1f) Co-authored-by: Jacek <jacek.duszenko@gmail.com>
diff --git 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"'[A-Z]:\\\\(?:[^\\\\]+\\\\)*[^\\\\]+'"
+            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
@@ -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:
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
@@ -0,0 +1 @@
+Fix invalid variable in :mod:`venv` handling of failed symlink on Windows

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix invalid variable in :mod:`venv` handling of failed symlink on Windows