Issue #23742: ntpath.expandvars() no longer loses unbalanced single quotes.

diff --git a/Lib/ntpath.py b/Lib/ntpath.py
index 11e4470a467fd6c48ec1ca61621dfae4d68c4a7e..58951b90516ae072429781e7a0342863ad676860 100644 (file)
--- a/Lib/ntpath.py
+++ b/Lib/ntpath.py
@@ -351,7 +351,7 @@ def expandvars(path):
                 index = path.index('\'')
                 res = res + '\'' + path[:index + 1]
             except ValueError:
-                res = res + path
+                res = res + c + path
                 index = pathlen - 1
         elif c == '%':  # variable or '%'
             if path[index + 1:index + 2] == '%':

diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py
index 55da7e1354fd6337294a1c51062d631d50b8dbb0..b9a4c906defc26ebdef9c013851cf0915c104110 100644 (file)
--- a/Lib/test/test_ntpath.py
+++ b/Lib/test/test_ntpath.py
@@ -206,6 +206,7 @@ class TestNtpath(unittest.TestCase):
             tester('ntpath.expandvars("%?bar%")', "%?bar%")
             tester('ntpath.expandvars("%foo%%bar")', "bar%bar")
             tester('ntpath.expandvars("\'%foo%\'%bar")', "\'%foo%\'%bar")
+            tester('ntpath.expandvars("bar\'%foo%")', "bar\'%foo%")
 
     @unittest.skipUnless(test_support.FS_NONASCII, 'need test_support.FS_NONASCII')
     def test_expandvars_nonascii(self):

diff --git a/Misc/NEWS b/Misc/NEWS
index 60ad651dc3a3b507c70dddd267375bde9b635dea..4d65d9aa2ba3756e562da2da1ead9c6df74f824d 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #23742: ntpath.expandvars() no longer loses unbalanced single quotes.
+
 - Issue #21802: The reader in BufferedRWPair now is closed even when closing
   writer failed in BufferedRWPair.close().