From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 26 Sep 2009 12:27:13 +0000 (+0000)
Subject: Merged revisions 75072 via svnmerge from
X-Git-Tag: v3.1.2rc1~486
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2dcd4c5a0f5fba4a1e34e4a902971c2e4ce7349f;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 75072 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r75072 | ezio.melotti | 2009-09-26 15:19:30 +0300 (Sat, 26 Sep 2009) | 1 line

  string.capwords is still around, adding back the tests
........
---

diff --git a/Lib/test/test_string.py b/Lib/test/test_string.py
index 16d1edb0e388..743fa6b27fe8 100644
--- a/Lib/test/test_string.py
+++ b/Lib/test/test_string.py
@@ -15,6 +15,14 @@ class ModuleTest(unittest.TestCase):
         string.punctuation
         string.printable
 
+    def test_capwords(self):
+        self.assertEqual(string.capwords('abc def ghi'), 'Abc Def Ghi')
+        self.assertEqual(string.capwords('abc\tdef\nghi'), 'Abc Def Ghi')
+        self.assertEqual(string.capwords('abc\t   def  \nghi'), 'Abc Def Ghi')
+        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')
+
     def test_formatter(self):
         fmt = string.Formatter()
         self.assertEqual(fmt.format("foo"), "foo")