diff options
| -rw-r--r-- | Doc/library/string.rst | 14 | ||||
| -rw-r--r-- | Lib/string.py | 10 | ||||
| -rw-r--r-- | Lib/test/test_string.py | 3 |
3 files changed, 17 insertions, 10 deletions
diff --git a/Doc/library/string.rst b/Doc/library/string.rst index 3466af6..cc05a7d 100644 --- a/Doc/library/string.rst +++ b/Doc/library/string.rst @@ -565,10 +565,12 @@ rule: Helper functions ---------------- -.. function:: capwords(s) - - Split the argument into words using :func:`split`, capitalize each word using - :func:`capitalize`, and join the capitalized words using :func:`join`. Note - that this replaces runs of whitespace characters by a single space, and removes - leading and trailing whitespace. +.. function:: capwords(s[, sep]) + + Split the argument into words using :meth:`str.split`, capitalize each word + using :meth:`str.capitalize`, and join the capitalized words using + :meth:`str.join`. If the optional second argument *sep* is absent + or ``None``, runs of whitespace characters are replaced by a single space + and leading and trailing whitespace are removed, otherwise *sep* is used to + split and join the words. diff --git a/Lib/string.py b/Lib/string.py index 4599997..5089193 100644 --- a/Lib/string.py +++ b/Lib/string.py @@ -29,15 +29,17 @@ printable = digits + ascii_letters + punctuation + whitespace # Capitalize the words in a string, e.g. " aBc dEf " -> "Abc Def". def capwords(s, sep=None): - """capwords(s, [sep]) -> string + """capwords(s [,sep]) -> string Split the argument into words using split, capitalize each word using capitalize, and join the capitalized words using - join. Note that this replaces runs of whitespace characters by - a single space. + join. If the optional second argument sep is absent or None, + runs of whitespace characters are replaced by a single space + and leading and trailing whitespace are removed, otherwise + sep is used to split and join the words. """ - return (sep or ' ').join([x.capitalize() for x in s.split(sep)]) + return (sep or ' ').join(x.capitalize() for x in s.split(sep)) #################################################################### diff --git a/Lib/test/test_string.py b/Lib/test/test_string.py index 743fa6b..b495d69 100644 --- a/Lib/test/test_string.py +++ b/Lib/test/test_string.py @@ -22,6 +22,9 @@ class ModuleTest(unittest.TestCase): self.assertEqual(string.capwords('ABC DEF GHI'), 'Abc Def Ghi') self.assertEqual(string.capwords('ABC-DEF-GHI', '-'), 'Abc-Def-Ghi') self.assertEqual(string.capwords('ABC-def DEF-ghi GHI'), 'Abc-def Def-ghi Ghi') + self.assertEqual(string.capwords(' aBc DeF '), 'Abc Def') + self.assertEqual(string.capwords('\taBc\tDeF\t'), 'Abc Def') + self.assertEqual(string.capwords('\taBc\tDeF\t', '\t'), '\tAbc\tDef\t') def test_formatter(self): fmt = string.Formatter() |