Merge pull request gregmalcolm#93 from knservis/Line_count_simplify

gregmalcolm · gregmalcolm · commit 6da34b10f4ef · 2014-05-06T12:11:29.000-04:00
Simplify line counting
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/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"))
