From e50dafcd636ba32db890600164698bb070d40d97 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sun, 6 Jul 2014 21:37:15 -0400 Subject: Issue #20639: calling Path.with_suffix('') allows removing the suffix again. Patch by July Tikhonov. --- Lib/pathlib.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Lib/pathlib.py') diff --git a/Lib/pathlib.py b/Lib/pathlib.py index c1ec07af8e..48b70317cd 100644 --- a/Lib/pathlib.py +++ b/Lib/pathlib.py @@ -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: -- cgit v1.2.1