Updated Python3 folder with new string changes

gregmalcolm · gregmalcolm · commit 35af22e44bdb · 2010-09-07T21:49:09.000-04:00
diff --git a/python 2/koans/about_strings.py b/python 2/koans/about_strings.py
@@ -17,14 +17,14 @@ def test_triple_quote_strings_are_also_strings(self):
         string = """Howdy, world!"""
         self.assertEqual(__, isinstance(string, basestring))
 
-    def test_raw_strings_are_also_strings(self):
-        string = r"Konnichi wa, world!"
-        self.assertEqual(__, isinstance(string, basestring))
-        
     def test_triple_single_quotes_work_too(self):
         string = '''Bonjour tout le monde!'''
         self.assertEqual(__, isinstance(string, basestring))
 
+    def test_raw_strings_are_also_strings(self):
+        string = r"Konnichi wa, world!"
+        self.assertEqual(__, isinstance(string, basestring))
+        
     def test_use_single_quotes_to_create_string_with_double_quotes(self):
         string = 'He said, "Go Away."'
         self.assertEqual(__, string)
@@ -158,4 +158,4 @@ def test_strings_can_change_case(self):
         self.assertEqual(__, 'guido'.upper())
         self.assertEqual(__, 'TimBot'.lower())
         self.assertEqual(__, 'guido van rossum'.title())
-        self.assertEqual(__, 'ToTaLlY aWeSoMe'.swapcase())
+        self.assertEqual(__, 'ToTaLlY aWeSoMe'.swapcase())
diff --git a/python 3/koans/about_strings.py b/python 3/koans/about_strings.py
@@ -21,6 +21,10 @@ def test_triple_single_quotes_work_too(self):
         string = '''Bonjour tout le monde!'''
         self.assertEqual(__, isinstance(string, str))
 
+    def test_raw_strings_are_also_strings(self):
+        string = r"Konnichi wa, world!"
+        self.assertEqual(__, isinstance(string, str))
+
     def test_use_single_quotes_to_create_string_with_double_quotes(self):
         string = 'He said, "Go Away."'
         self.assertEqual(__, string)
@@ -57,7 +61,11 @@ def but_you_still_have_to_be_careful_at_the_end_of_a_triple_quoted_string(self):
     def test_plus_concatenates_strings(self):
         string = "Hello, " + "world"
         self.assertEqual(__, string)
-    
+
+    def test_adjacent_strings_are_concatenated_automatically(self):
+        string = "Hello" ", " "World"
+        self.assertEqual(__, string)
+        
     def test_plus_will_not_modify_original_strings(self):
         hi = "Hello, "
         there = "world"
@@ -125,22 +133,29 @@ def test_strings_can_be_split_with_different_patterns(self):
         import re #import python regular expression library
         
         string = "the,rain;in,spain"
-        pattern = re.compile(r',|;')
+        pattern = re.compile(',|;')
         
         words = pattern.split(string)
         
         self.assertListEqual([__, __, __, __], words)
         
         # Pattern is a Python regular expression pattern which matches ',' or ';'
 
-    def test_regular_expression_strings_do_not_interpret_escape_characters(self):
+    def test_raw_strings_do_not_interpret_escape_characters(self):
         string = r'\n'
         self.assertNotEqual('\n', string)
         self.assertEqual(__, string)
         self.assertEqual(__, len(string))
-        
-        # This is to make patterns easier to read
+
+        # Useful in regular expressions, file paths, URLs, etc.   
       
     def test_strings_can_be_joined(self):
         words = ["Now", "is", "the", "time"]
         self.assertEqual(__, ' '.join(words))
+
+    def test_strings_can_change_case(self):
+        self.assertEqual(__, 'guido'.capitalize())
+        self.assertEqual(__, 'guido'.upper())
+        self.assertEqual(__, 'TimBot'.lower())
+        self.assertEqual(__, 'guido van rossum'.title())
+        self.assertEqual(__, 'ToTaLlY aWeSoMe'.swapcase())
