mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #21714: Disallow the construction of invalid paths using Path.with_name(). Original patch by Antony Lee.

Browse source
This commit is contained in:
Antoine Pitrou 2014-07-06 21:31:12 -04:00
parent 7bc5fb6916
commit 7084e736db
3 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/pathlib.py
View file

@ -749,6 +749,10 @@ class PurePath(object):
"""Return a new path with the file name changed.""" """Return a new path with the file name changed."""
if not self.name: if not self.name:
raise ValueError("%r has an empty name" % (self,)) 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, return self._from_parsed_parts(self._drv, self._root,
self._parts[:-1] + [name]) self._parts[:-1] + [name])

8
Lib/test/test_pathlib.py
View file

@ -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('.').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): def test_with_suffix_common(self):
P = self.cls 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('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('//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): def test_with_suffix(self):
P = self.cls P = self.cls

3
Misc/NEWS
View file

@ -27,6 +27,9 @@ Core and Builtins
Library 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 - Issue #21897: Fix a crash with the f_locals attribute with closure
variables when frame.clear() has been called. variables when frame.clear() has been called.