mirror of https://github.com/python/cpython
Issue #21714: Disallow the construction of invalid paths using Path.with_name(). Original patch by Antony Lee.
This commit is contained in:
parent
7bc5fb6916
commit
7084e736db
|
@ -749,6 +749,10 @@ class PurePath(object):
|
|||
"""Return a new path with the file name changed."""
|
||||
if not self.name:
|
||||
raise ValueError("%r has an empty name" % (self,))
|
||||
drv, root, parts = self._flavour.parse_parts((name,))
|
||||
if (not name or name[-1] in [self._flavour.sep, self._flavour.altsep]
|
||||
or drv or root or len(parts) != 1):
|
||||
raise ValueError("Invalid name %r" % (name))
|
||||
return self._from_parsed_parts(self._drv, self._root,
|
||||
self._parts[:-1] + [name])
|
||||
|
||||
|
|
|
@ -540,6 +540,10 @@ class _BasePurePathTest(object):
|
|||
self.assertRaises(ValueError, P('').with_name, 'd.xml')
|
||||
self.assertRaises(ValueError, P('.').with_name, 'd.xml')
|
||||
self.assertRaises(ValueError, P('/').with_name, 'd.xml')
|
||||
self.assertRaises(ValueError, P('a/b').with_name, '')
|
||||
self.assertRaises(ValueError, P('a/b').with_name, '/c')
|
||||
self.assertRaises(ValueError, P('a/b').with_name, 'c/')
|
||||
self.assertRaises(ValueError, P('a/b').with_name, 'c/d')
|
||||
|
||||
def test_with_suffix_common(self):
|
||||
P = self.cls
|
||||
|
@ -950,6 +954,10 @@ class PureWindowsPathTest(_BasePurePathTest, unittest.TestCase):
|
|||
self.assertRaises(ValueError, P('c:').with_name, 'd.xml')
|
||||
self.assertRaises(ValueError, P('c:/').with_name, 'd.xml')
|
||||
self.assertRaises(ValueError, P('//My/Share').with_name, 'd.xml')
|
||||
self.assertRaises(ValueError, P('c:a/b').with_name, 'd:')
|
||||
self.assertRaises(ValueError, P('c:a/b').with_name, 'd:e')
|
||||
self.assertRaises(ValueError, P('c:a/b').with_name, 'd:/e')
|
||||
self.assertRaises(ValueError, P('c:a/b').with_name, '//My/Share')
|
||||
|
||||
def test_with_suffix(self):
|
||||
P = self.cls
|
||||
|
|
|
@ -27,6 +27,9 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #21714: Disallow the construction of invalid paths using
|
||||
Path.with_name(). Original patch by Antony Lee.
|
||||
|
||||
- Issue #21897: Fix a crash with the f_locals attribute with closure
|
||||
variables when frame.clear() has been called.
|
||||
|
||||
|
|
Loading…
Reference in New Issue