[Python-checkins] cpython (2.7): Issue #23742: ntpath.expandvars() no longer loses unbalanced single quotes.
serhiy.storchaka
python-checkins at python.org
Wed Mar 25 15:41:59 CET 2015
https://hg.python.org/cpython/rev/9f4d2bdced9c
changeset: 95201:9f4d2bdced9c
branch: 2.7
parent: 95184:dcf25060cae8
user: Serhiy Storchaka <storchaka at gmail.com>
date: Wed Mar 25 16:39:58 2015 +0200
summary:
Issue #23742: ntpath.expandvars() no longer loses unbalanced single quotes.
files:
Lib/ntpath.py | 2 +-
Lib/test/test_ntpath.py | 1 +
Misc/NEWS | 2 ++
3 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/Lib/ntpath.py b/Lib/ntpath.py
--- 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] == '%':
diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py
--- 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):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,8 @@
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().
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list