Remove catching OSError in ftphandler test. Only URLError is raised in urllib.request module. (#918) (#920)

orsenthil · web-flow · commit 8d1f935945ca · 2017-03-30T23:15:51.000-07:00
(cherry picked from commit ed3dd1c)
diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
@@ -830,7 +830,6 @@ def test_file(self):
         for url, ftp in [
             ("file://ftp.example.com//foo.txt", False),
             ("file://ftp.example.com///foo.txt", False),
-# XXXX bug: fails with OSError, should be URLError
             ("file://ftp.example.com/foo.txt", False),
             ("file://somehost//foo/something.txt", False),
             ("file://localhost//foo/something.txt", False),
@@ -839,7 +838,7 @@ def test_file(self):
             try:
                 h.file_open(req)
             # XXXX remove OSError when bug fixed
-            except (urllib.error.URLError, OSError):
+            except urllib.error.URLError:
                 self.assertFalse(ftp)
             else:
                 self.assertIs(o.req, req)
@@ -1689,7 +1688,6 @@ def test_invalid_closed(self):
         self.assertTrue(conn.fakesock.closed, "Connection not closed")
 
 
-
 class MiscTests(unittest.TestCase):
 
     def opener_has_handler(self, opener, handler_class):
