Merge pull request gregmalcolm#1 from gregmalcolm/master

Khamid Tomov · Khamid Tomov · commit 77083369d289 · 2014-07-09T00:11:47.000+04:00
sync
diff --git a/python2/contemplate_koans.py b/python2/contemplate_koans.py
@@ -10,27 +10,26 @@
 # So thank guys!
 #
 
-import unittest
 import sys
 
 
 if __name__ == '__main__':
     if sys.version_info >= (3, 0):
         print("\nThis is the Python 2 version of Python Koans, but you are " +
-            "running it with Python 3 or newer!\n\n"
-            "Did you accidentally use the wrong python script? \nTry:\n\n" +
-            "    python contemplate_koans.py\n")
+              "running it with Python 3 or newer!\n\n"
+              "Did you accidentally use the wrong python script? \nTry:\n\n" +
+              "    python contemplate_koans.py\n")
     else:
         if sys.version_info < (2, 7):
             print("\n" +
-                "********************************************************\n" +
-                "WARNING:\n" +
-                "This version of Python Koans was designed for " +
-                "Python 2.7 or greater.\n" +
-                "Your version of Python is older, so you may run into " +
-                "problems!\n\n" +
-                "But lets see how far we get...\n" +
-                "********************************************************\n")
+                  "********************************************************\n" +
+                  "WARNING:\n" +
+                  "This version of Python Koans was designed for " +
+                  "Python 2.7 or greater.\n" +
+                  "Your version of Python is older, so you may run into " +
+                  "problems!\n\n" +
+                  "But lets see how far we get...\n" +
+                  "********************************************************\n")
 
         from runner.mountain import Mountain
 
diff --git a/python2/koans/about_class_attributes.py b/python2/koans/about_class_attributes.py
@@ -14,7 +14,7 @@ class Dog(object):
 
     def test_new_style_class_objects_are_objects(self):
         # Note: Old style class instances are not objects but they are being
-        # phased out it Python 3.
+        # phased out in Python 3.
 
         fido = self.Dog()
         self.assertEqual(__, isinstance(fido, object))
diff --git a/python2/koans/about_classes.py b/python2/koans/about_classes.py
@@ -109,7 +109,7 @@ def test_args_must_match_init(self):
         # THINK ABOUT IT:
         # Why is this so?
 
-    def test_different_objects_have_difference_instance_variables(self):
+    def test_different_objects_have_different_instance_variables(self):
         fido = self.Dog5("Fido")
         rover = self.Dog5("Rover")
 
diff --git a/python2/koans/about_control_statements.py b/python2/koans/about_control_statements.py
@@ -18,6 +18,15 @@ def test_if_then_statements(self):
         if True:
             result = 'true value'
         self.assertEqual(__, result)
+        
+    def test_if_then_elif_else_statements(self):
+        if False:
+            result = 'first value'
+        elif True: 
+            result = 'true value'
+        else:
+            result = 'default value'
+        self.assertEqual(__, result)
 
     def test_while_statement(self):
         i = 1
diff --git a/python2/koans/about_deleting_objects.py b/python2/koans/about_deleting_objects.py
@@ -1,4 +1,4 @@
-    #!/usr/bin/env python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from runner.koan import *
diff --git a/python2/koans/about_iteration.py b/python2/koans/about_iteration.py
@@ -94,7 +94,7 @@ def test_use_pass_for_iterations_with_no_body(self):
     # ------------------------------------------------------------------
 
     def test_all_iteration_methods_work_on_any_sequence_not_just_lists(self):
-        # Ranges are an iteratable sequence
+        # Ranges are an iterable sequence
         result = map(self.add_ten, range(1, 4))
         self.assertEqual(__, list(result))
 
diff --git a/python2/koans/about_packages.py b/python2/koans/about_packages.py
@@ -56,7 +56,7 @@ def test_use_absolute_imports_to_import_upper_level_modules(self):
         # contemplate_koans.py is the root module in this package because its
         # the first python module called in koans.
         #
-        # If contemplate_koan.py was based in a_package_folder that would be
+        # If contemplate_koans.py was based in a_package_folder that would be
         # the root folder, which would make reaching the koans folder
         # almost impossible. So always leave the starting python script in
         # a folder which can reach everything else.
diff --git a/python2/koans/about_proxy_object_project.py b/python2/koans/about_proxy_object_project.py
@@ -13,7 +13,7 @@
 # missing handler and any other supporting methods.  The specification
 # of the Proxy class is given in the AboutProxyObjectProject koan.
 
-# Note: This is a bit trickier that its Ruby Koans counterpart, but you
+# Note: This is a bit trickier than its Ruby Koans counterpart, but you
 # can do it!
 
 from runner.koan import *
diff --git a/python2/koans/about_regex.py b/python2/koans/about_regex.py
@@ -30,7 +30,7 @@ def test_matching_literal_text_how_many(self):
         """
             Lesson 1 -- How many matches?
 
-            The default behaviour of most regular extression engines is
+            The default behaviour of most regular expression engines is
             to return just the first match. In python you have the
             following options:
 
@@ -63,8 +63,8 @@ def test_matching_literal_text_not_case_sensitivity(self):
         string = "Hello, my name is Felix or felix and this koan " + \
             "is based on Ben's book: Regular Expressions in 10 minutes."
 
-        self.assertEqual(re.findall("felix", string, 20), __)
-        self.assertEqual(re.findall("felix", string, 10), __)
+        self.assertEqual(re.findall("felix", string), __)
+        self.assertEqual(re.findall("felix", string, re.IGNORECASE), __)
 
     def test_matching_any_character(self):
         """
diff --git a/python2/koans/about_triangle_project2.py b/python2/koans/about_triangle_project2.py
@@ -16,4 +16,4 @@ def test_illegal_triangles_throw_exceptions(self):
 
         self.assertRaises(TriangleError, triangle, 3, 4, -5)
         self.assertRaises(TriangleError, triangle, 1, 1, 3)
-        self.assertRaises(TriangleError, triangle, 2, 4, 2)
+        self.assertRaises(TriangleError, triangle, 2, 5, 2)
diff --git a/python2/koans/about_true_and_false.py b/python2/koans/about_true_and_false.py
@@ -39,3 +39,4 @@ def test_everything_else_is_treated_as_true(self):
             __,
             self.truth_value("Python is named after Monty Python"))
         self.assertEqual(__, self.truth_value(' '))
+        self.assertEqual(__, self.truth_value('0'))
diff --git a/python2/koans/about_with_statements.py b/python2/koans/about_with_statements.py
@@ -15,10 +15,7 @@ def count_lines(self, file_name):
         try:
             f = open(file_name)
             try:
-                count = 0
-                for line in f.readlines():
-                    count += 1
-                return count
+                return len(f.readlines())
             finally:
                 f.close()
         except IOError:
@@ -86,10 +83,7 @@ def __exit__(self, cls, value, tb):
 
     def count_lines2(self, file_name):
         with self.FileContextManager(file_name) as f:
-            count = 0
-            for line in f.readlines():
-                count += 1
-        return count
+            return len(f.readlines())
 
     def test_counting_lines2(self):
         self.assertEqual(__, self.count_lines2("example_file.txt"))
@@ -108,10 +102,7 @@ def test_finding_lines2(self):
 
     def count_lines3(self, file_name):
         with open(file_name) as f:
-            count = 0
-            for line in f.readlines():
-                count += 1
-            return count
+            return len(f.readlines())
 
     def test_open_already_has_its_own_built_in_context_manager(self):
         self.assertEqual(__, self.count_lines3("example_file.txt"))
diff --git a/python2/runner/path_to_enlightenment.py b/python2/runner/path_to_enlightenment.py
@@ -88,5 +88,6 @@ def koans():
     suite.addTests(loader.loadTestsFromTestCase(AboutProxyObjectProject))
     suite.addTests(loader.loadTestsFromTestCase(TelevisionTest))
     suite.addTests(loader.loadTestsFromTestCase(AboutExtraCredit))
+    suite.addTests(loader.loadTestsFromTestCase(AboutRegex))
 
     return suite
diff --git a/python3/contemplate_koans.py b/python3/contemplate_koans.py
@@ -10,26 +10,25 @@
 # So thanks guys!
 #
 
-import unittest
 import sys
 
 if __name__ == '__main__':
     if sys.version_info < (3, 0):
         print("\nThis is the Python 3 version of Python Koans, but you are " +
-            "running it with Python 2!\n\n"
-            "Did you accidentally use the wrong python script? \nTry:\n\n" +
-            "    python3 contemplate_koans.py\n")
+              "running it with Python 2!\n\n"
+              "Did you accidentally use the wrong python script? \nTry:\n\n" +
+              "    python3 contemplate_koans.py\n")
     else:
         if sys.version_info < (3, 3):
             print("\n" +
-                "********************************************************\n" +
-                "WARNING:\n" +
-                "This version of Python Koans was designed for " +
-                "Python 3.3 or greater.\n" +
-                "Your version of Python is older, so you may run into " +
-                "problems!\n\n" +
-                "But lets see how far we get...\n" +
-                "********************************************************\n")
+                  "********************************************************\n" +
+                  "WARNING:\n" +
+                  "This version of Python Koans was designed for " +
+                  "Python 3.3 or greater.\n" +
+                  "Your version of Python is older, so you may run into " +
+                  "problems!\n\n" +
+                  "But lets see how far we get...\n" +
+                  "********************************************************\n")
 
         from runner.mountain import Mountain
 
diff --git a/python3/koans/about_classes.py b/python3/koans/about_classes.py
@@ -115,7 +115,7 @@ def test_args_must_match_init(self):
         # THINK ABOUT IT:
         # Why is this so?
 
-    def test_different_objects_have_difference_instance_variables(self):
+    def test_different_objects_have_different_instance_variables(self):
         fido = self.Dog5("Fido")
         rover = self.Dog5("Rover")
 
diff --git a/python3/koans/about_comprehension.py b/python3/koans/about_comprehension.py
@@ -46,7 +46,7 @@ def test_double_list_comprehension(self):
     def test_creating_a_set_with_set_comprehension(self):
         comprehension = { x for x in 'aabbbcccc'}
 
-        self.assertEqual(__, comprehension)  # remeber that set members are unique
+        self.assertEqual(__, comprehension)  # remember that set members are unique
 
     def test_creating_a_dictionary_with_dictionary_comprehension(self):
         dict_of_weapons = {'first': 'fear', 'second': 'surprise',
diff --git a/python3/koans/about_control_statements.py b/python3/koans/about_control_statements.py
@@ -17,6 +17,15 @@ def test_if_then_statements(self):
         if True:
             result = 'true value'
         self.assertEqual(__, result)
+        
+    def test_if_then_elif_else_statements(self):
+        if False:
+            result = 'first value'
+        elif True: 
+            result = 'true value'
+        else:
+            result = 'default value'
+        self.assertEqual(__, result)
 
     def test_while_statement(self):
         i = 1
diff --git a/python3/koans/about_iteration.py b/python3/koans/about_iteration.py
@@ -41,7 +41,7 @@ def test_map_transforms_elements_of_a_list(self):
 
         self.assertNotEqual(list, mapping.__class__)
         self.assertEqual(__, mapping.__class__)
-        # In Python 3 built in iterator funcs return iteratable view objects
+        # In Python 3 built in iterator funcs return iterable view objects
         # instead of lists
 
         for item in mapping:
@@ -116,7 +116,7 @@ def test_use_pass_for_iterations_with_no_body(self):
     # ------------------------------------------------------------------
 
     def test_all_iteration_methods_work_on_any_sequence_not_just_lists(self):
-        # Ranges are an iteratable sequence
+        # Ranges are an iterable sequence
         result = map(self.add_ten, range(1,4))
         self.assertEqual(__, list(result))
 
diff --git a/python3/koans/about_modules.py b/python3/koans/about_modules.py
@@ -34,7 +34,7 @@ def test_we_can_import_multiple_items_at_once(self):
 
     def test_importing_all_module_attributes_at_once(self):
         # NOTE Using this module level import declared at the top of this script:
-        #   from .other_local_module import *
+        #   from .another_local_module import *
         #
         # Import wildcard cannot be used from within classes or functions
 
diff --git a/python3/koans/about_packages.py b/python3/koans/about_packages.py
@@ -48,7 +48,7 @@ def test_use_absolute_imports_to_import_upper_level_modules(self):
         # contemplate_koans.py is the root module in this package because its
         # the first python module called in koans.
         #
-        # If contemplate_koan.py was based in a_package_folder that would be
+        # If contemplate_koans.py was based in a_package_folder that would be
         # the root folder, which would make reaching the koans folder
         # almost impossible. So always leave the starting python script in
         # a folder which can reach everything else.
diff --git a/python3/koans/about_proxy_object_project.py b/python3/koans/about_proxy_object_project.py
@@ -13,7 +13,7 @@
 # missing handler and any other supporting methods.  The specification
 # of the Proxy class is given in the AboutProxyObjectProject koan.
 
-# Note: This is a bit trickier that its Ruby Koans counterpart, but you
+# Note: This is a bit trickier than its Ruby Koans counterpart, but you
 # can do it!
 
 from runner.koan import *
diff --git a/python3/koans/about_regex.py b/python3/koans/about_regex.py
@@ -22,7 +22,7 @@ def test_matching_literal_text_how_many(self):
         """
             Lesson 1 How many matches?
 
-            The default behaviour of most regular extression engines is to return just the first match.
+            The default behaviour of most regular expression engines is to return just the first match.
             In python you have the next options:
 
                 match()    -->  Determine if the RE matches at the beginning of the string.
@@ -47,8 +47,8 @@ def test_matching_literal_text_not_case_sensitivity(self):
         """
         string = "Hello, my name is Felix or felix and this koans is based on the Ben's book: Regular Expressions in 10 minutes."
 
-        self.assertEqual(re.findall("felix", string, 20), __)
-        self.assertEqual(re.findall("felix", string, 10), __)
+        self.assertEqual(re.findall("felix", string), __)
+        self.assertEqual(re.findall("felix", string, re.IGNORECASE), __)
 
     def test_matching_any_character(self):
         """
@@ -92,7 +92,7 @@ def test_matching_set_character(self):
     def test_anything_but_matching(self):
         """
             Lesson 2 Using character set ranges
-            Occsionally, you'll want a list of characters that you don't want to match.
+            Occasionally, you'll want a list of characters that you don't want to match.
             Character sets can be negated using the ^ metacharacter.
 
         """
diff --git a/python3/koans/about_triangle_project2.py b/python3/koans/about_triangle_project2.py
@@ -20,6 +20,6 @@ def test_illegal_triangles_throw_exceptions(self):
             triangle(1, 1, 3)
 
         with self.assertRaises(TriangleError):
-            triangle(2, 4, 2)
+            triangle(2, 5, 2)
 
 
diff --git a/python3/koans/about_true_and_false.py b/python3/koans/about_true_and_false.py
@@ -36,3 +36,4 @@ def test_everything_else_is_treated_as_true(self):
         self.assertEqual(__, self.truth_value(1,))
         self.assertEqual(__, self.truth_value("Python is named after Monty Python"))
         self.assertEqual(__, self.truth_value(' '))
+        self.assertEqual(__, self.truth_value('0'))
diff --git a/python3/koans/about_tuples.py b/python3/koans/about_tuples.py
@@ -6,7 +6,7 @@
 class AboutTuples(Koan):
     def test_creating_a_tuple(self):
         count_of_three =  (1, 2, 5)
-        self.assertEqual(5, __)
+        self.assertEqual(__, count_of_three[2])
 
     def test_tuples_are_immutable_so_item_assignment_is_not_possible(self):
         count_of_three =  (1, 2, 5)
diff --git a/python3/koans/about_with_statements.py b/python3/koans/about_with_statements.py
@@ -14,10 +14,7 @@ def count_lines(self, file_name):
         try:
             file = open(file_name)
             try:
-                count = 0
-                for line in file.readlines():
-                    count += 1
-                return count
+                return len(file.readlines())
             finally:
                 file.close()
         except IOError:
@@ -85,10 +82,7 @@ def __exit__(self, cls, value, tb):
 
     def count_lines2(self, file_name):
         with self.FileContextManager(file_name) as file:
-            count = 0
-            for line in file.readlines():
-                count += 1
-        return count
+            return len(file.readlines())
 
     def test_counting_lines2(self):
         self.assertEqual(__, self.count_lines2("example_file.txt"))
@@ -107,10 +101,7 @@ def test_finding_lines2(self):
 
     def count_lines3(self, file_name):
         with open(file_name) as file:
-            count = 0
-            for line in file.readlines():
-              count += 1
-            return count
+            return len(file.readlines())
 
     def test_open_already_has_its_own_built_in_context_manager(self):
         self.assertEqual(__, self.count_lines3("example_file.txt"))
diff --git a/python3/runner/path_to_enlightenment.py b/python3/runner/path_to_enlightenment.py
@@ -86,5 +86,6 @@ def koans():
     suite.addTests(loader.loadTestsFromTestCase(AboutProxyObjectProject))
     suite.addTests(loader.loadTestsFromTestCase(TelevisionTest))
     suite.addTests(loader.loadTestsFromTestCase(AboutExtraCredit))
+    suite.addTests(loader.loadTestsFromTestCase(AboutRegex))
 
     return suite

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`- #!/usr/bin/env python`
	`1`	`+#!/usr/bin/env python`
`2`	`2`	`# -- coding: utf-8 --`
`3`	`3`
`4`	`4`	`from runner.koan import *`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ def test_use_absolute_imports_to_import_upper_level_modules(self):`
`56`	`56`	`# contemplate_koans.py is the root module in this package because its`
`57`	`57`	`# the first python module called in koans.`
`58`	`58`	`#`
`59`		`- # If contemplate_koan.py was based in a_package_folder that would be`
	`59`	`+ # If contemplate_koans.py was based in a_package_folder that would be`
`60`	`60`	`# the root folder, which would make reaching the koans folder`
`61`	`61`	`# almost impossible. So always leave the starting python script in`
`62`	`62`	`# a folder which can reach everything else.`