Issue #20639: calling Path.with_suffix('') allows removing the suffix again.
Patch by July Tikhonov.
This commit is contained in:
parent
7084e736db
commit
e50dafcd63
|
@ -759,11 +759,10 @@ class PurePath(object):
|
|||
def with_suffix(self, suffix):
|
||||
"""Return a new path with the file suffix changed (or added, if none)."""
|
||||
# XXX if suffix is None, should the current suffix be removed?
|
||||
drv, root, parts = self._flavour.parse_parts((suffix,))
|
||||
if drv or root or len(parts) != 1:
|
||||
f = self._flavour
|
||||
if f.sep in suffix or f.altsep and f.altsep in suffix:
|
||||
raise ValueError("Invalid suffix %r" % (suffix))
|
||||
suffix = parts[0]
|
||||
if not suffix.startswith('.'):
|
||||
if suffix and not suffix.startswith('.') or suffix == '.':
|
||||
raise ValueError("Invalid suffix %r" % (suffix))
|
||||
name = self.name
|
||||
if not name:
|
||||
|
|
|
@ -551,6 +551,9 @@ class _BasePurePathTest(object):
|
|||
self.assertEqual(P('/a/b').with_suffix('.gz'), P('/a/b.gz'))
|
||||
self.assertEqual(P('a/b.py').with_suffix('.gz'), P('a/b.gz'))
|
||||
self.assertEqual(P('/a/b.py').with_suffix('.gz'), P('/a/b.gz'))
|
||||
# Stripping suffix
|
||||
self.assertEqual(P('a/b.py').with_suffix(''), P('a/b'))
|
||||
self.assertEqual(P('/a/b').with_suffix(''), P('/a/b'))
|
||||
# Path doesn't have a "filename" component
|
||||
self.assertRaises(ValueError, P('').with_suffix, '.gz')
|
||||
self.assertRaises(ValueError, P('.').with_suffix, '.gz')
|
||||
|
@ -558,9 +561,12 @@ class _BasePurePathTest(object):
|
|||
# Invalid suffix
|
||||
self.assertRaises(ValueError, P('a/b').with_suffix, 'gz')
|
||||
self.assertRaises(ValueError, P('a/b').with_suffix, '/')
|
||||
self.assertRaises(ValueError, P('a/b').with_suffix, '.')
|
||||
self.assertRaises(ValueError, P('a/b').with_suffix, '/.gz')
|
||||
self.assertRaises(ValueError, P('a/b').with_suffix, 'c/d')
|
||||
self.assertRaises(ValueError, P('a/b').with_suffix, '.c/.d')
|
||||
self.assertRaises(ValueError, P('a/b').with_suffix, './.d')
|
||||
self.assertRaises(ValueError, P('a/b').with_suffix, '.d/.')
|
||||
|
||||
def test_relative_to_common(self):
|
||||
P = self.cls
|
||||
|
|
Loading…
Reference in New Issue