commit 53b542fe30467aab7b8e396a33b1466b3d70e06a
author Serhiy Storchaka <storchaka@gmail.com> Wed Mar 25 16:39:58 2015 +0200
committer Serhiy Storchaka <storchaka@gmail.com> Wed Mar 25 16:39:58 2015 +0200
tree bdc3b677cd30a14212cc2cb8bf64a999ee5c551e
parent f95a57f9a19a4e593e87f34a5358372d5b6d08e8

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

Lib/ntpath.py

diff --git a/Lib/ntpath.py b/Lib/ntpath.py
index 11e4470..58951b9 100644
--- a/Lib/ntpath.py
+++ b/Lib/ntpath.py
@@ -351,7 +351,7 @@
                 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] == '%':

Lib/test/test_ntpath.py

diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py
index 55da7e1..b9a4c90 100644
--- a/Lib/test/test_ntpath.py
+++ b/Lib/test/test_ntpath.py
@@ -206,6 +206,7 @@
             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):