Merge branch 'master' into drop-support-for-python-2

gregmalcolm · web-flow · commit 4b403aec617d · 2021-03-04T19:04:27.000-05:00
diff --git a/README.rst b/README.rst
@@ -146,10 +146,9 @@ On Windows::
 
     $ pip install pywin32
 
-(If that failed, try::
-
-    $ pip install pypiwin32
-)
+    Also available here:
+    
+    https://github.com/mhammond/pywin32/releases
 
 On Mac OS X::
 
diff --git a/python3/koans/about_iteration.py b/python3/koans/about_iteration.py
@@ -64,21 +64,23 @@ def is_even(item):
 
         self.assertEqual(__, even_numbers)
 
-    def test_just_return_first_item_found(self):
+    def test_filter_returns_all_items_matching_criterion(self):
         def is_big_name(item):
-            return len(item) > 4
-
-        names = ["Jim", "Bill", "Clarence", "Doug", "Eli"]
-        name = None
+             return len(item) > 4
 
+        names = ["Jim", "Bill", "Clarence", "Doug", "Eli", "Elizabeth"]
         iterator = filter(is_big_name, names)
+
+        self.assertEqual(__, next(iterator))
+        self.assertEqual(__, next(iterator))
+
         try:
-            name = next(iterator)
+            next(iterator)
+            pass
         except StopIteration:
             msg = 'Ran out of big names'
 
-        self.assertEqual(__, name)
-
+        self.assertEquals(__, msg)
 
     # ------------------------------------------------------------------
 
@@ -120,18 +122,11 @@ def test_all_iteration_methods_work_on_any_sequence_not_just_lists(self):
         result = map(self.add_ten, range(1,4))
         self.assertEqual(__, list(result))
 
-        try:
-            file = open("example_file.txt")
-
-            try:
-                def make_upcase(line):
-                    return line.strip().upper()
-                upcase_lines = map(make_upcase, file.readlines())
-                self.assertEqual(__, list(upcase_lines))
-            finally:
-                # Arg, this is ugly.
-                # We will figure out how to fix this later.
-                file.close()
-        except IOError:
-            # should never happen
-            self.fail()
+    def test_lines_in_a_file_are_iterable_sequences_too(self):
+        def make_upcase(line):
+            return line.strip().title()
+
+        file = open("example_file.txt")
+        upcase_lines = map(make_upcase, file.readlines())
+        self.assertEqual(__, list(upcase_lines))
+        file.close()
