summaryrefslogtreecommitdiffstats
path: root/Lib/string.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2009-09-26 11:20:53 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2009-09-26 11:20:53 (GMT)
commit9aac2455ab9b47033b8b0807e28a3d8b4a9d9d37 (patch)
tree44ea056442ffde8359132c38fd1243ada17acf49 /Lib/string.py
parentafdbe3d661c8abbbcb8737a85d1289ae135579e4 (diff)
downloadcpython-9aac2455ab9b47033b8b0807e28a3d8b4a9d9d37.zip
cpython-9aac2455ab9b47033b8b0807e28a3d8b4a9d9d37.tar.gz
cpython-9aac2455ab9b47033b8b0807e28a3d8b4a9d9d37.tar.bz2
#7000: document "sep" in capwords. Add a few tests
Diffstat (limited to 'Lib/string.py')
-rw-r--r--Lib/string.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/Lib/string.py b/Lib/string.py
index e4d9e4f..6faa1f0 100644
--- a/Lib/string.py
+++ b/Lib/string.py
@@ -43,15 +43,17 @@ del l
# 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 string