From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 23 Jun 2012 23:34:13 +0000 (+0200)
Subject: Errors in "client" methods in test_socket were ignored because of a bogus except... 
X-Git-Tag: v3.3.0b1~95
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7eb563a2a69ba7182b8dc0634b53dc37b7d93a1;p=thirdparty%2FPython%2Fcpython.git

Errors in "client" methods in test_socket were ignored because of a bogus except clause.
(this could reveal test failures!)
---

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 092e94f38034..8520401b4df3 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -2,6 +2,7 @@
 
 import unittest
 from test import support
+from unittest.case import _ExpectedFailure
 
 import errno
 import io
@@ -241,7 +242,7 @@ class ThreadableTest:
             raise TypeError("test_func must be a callable function")
         try:
             test_func()
-        except unittest._ExpectedFailure:
+        except _ExpectedFailure:
             # We deliberately ignore expected failures
             pass
         except BaseException as e: