diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2009-09-26 12:35:01 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2009-09-26 12:35:01 (GMT) |
| commit | 029625c3f6bf3a205a04f067facaae21174ef48a (patch) | |
| tree | ab486b1307906c48271d8860fad6839b2b58e139 /Lib/string.py | |
| parent | 2dcd4c5a0f5fba4a1e34e4a902971c2e4ce7349f (diff) | |
| download | cpython-029625c3f6bf3a205a04f067facaae21174ef48a.zip cpython-029625c3f6bf3a205a04f067facaae21174ef48a.tar.gz cpython-029625c3f6bf3a205a04f067facaae21174ef48a.tar.bz2 | |
Merged revisions 75074 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r75074 | ezio.melotti | 2009-09-26 15:33:22 +0300 (Sat, 26 Sep 2009) | 9 lines
Merged revisions 75070 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75070 | ezio.melotti | 2009-09-26 14:20:53 +0300 (Sat, 26 Sep 2009) | 1 line
#7000: document "sep" in capwords. Add a few tests
........
................
Diffstat (limited to 'Lib/string.py')
| -rw-r--r-- | Lib/string.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Lib/string.py b/Lib/string.py index e071a2d..a9898e8 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)) # Construct a translation map for bytes.translate |