From 1b87ae0c910e4bcf652bd45a2c8c62ff11606b47 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Wed, 25 Mar 2015 16:40:15 +0200 Subject: Issue #23742: ntpath.expandvars() no longer loses unbalanced single quotes. --- Lib/ntpath.py | 2 +- Lib/test/test_ntpath.py | 1 + Misc/NEWS | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Lib/ntpath.py b/Lib/ntpath.py index af3fb87..992970a 100644 --- a/Lib/ntpath.py +++ b/Lib/ntpath.py @@ -400,7 +400,7 @@ def expandvars(path): index = path.index(c) res += c + path[:index + 1] except ValueError: - res += path + res += c + path index = pathlen - 1 elif c == percent: # variable or '%' if path[index + 1:index + 2] == percent: diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py index c8d84a7..dacddde 100644 --- a/Lib/test/test_ntpath.py +++ b/Lib/test/test_ntpath.py @@ -237,6 +237,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(support.FS_NONASCII, 'need support.FS_NONASCII') def test_expandvars_nonascii(self): diff --git a/Misc/NEWS b/Misc/NEWS index fb40003..7075ef8 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -18,6 +18,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(). -- cgit v0.12