commit 8d1f935945ca8cf3665315e0f82358fffe689353
author Senthil Kumaran <skumaran@gatech.edu> Thu Mar 30 23:15:51 2017 -0700
committer GitHub <noreply@github.com> Thu Mar 30 23:15:51 2017 -0700
tree d212c7437c0b8bc1c47acf64955228335c7be8e9
parent 599bb181036f724629a515317f0f39520950d51c

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

(cherry picked from commit ed3dd1c02af6872bd0748f7b9a5dadb89f7b830f)

Lib/test/test_urllib2.py

diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index 308acb3..b537fca 100644
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -830,7 +830,6 @@
         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 @@
             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 @@
         self.assertTrue(conn.fakesock.closed, "Connection not closed")
 
 
-
 class MiscTests(unittest.TestCase):
 
     def opener_has_handler(self, opener, handler_class):