From: R. David Murray <rdmurray@bitdance.com>
Date: Mon, 30 Mar 2009 20:04:06 +0000 (+0000)
Subject: Remove references to test_socket_ssl which was deleted in trunk
X-Git-Tag: v2.7a1~1735
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7c9e092b3d339718b0794f6a593a5032b6b9fb5;p=thirdparty%2FPython%2Fcpython.git

Remove references to test_socket_ssl which was deleted in trunk
in r64392 and py3k in r59038.
---

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 3be9f6d49f6c..3fa4838a27a4 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -778,9 +778,6 @@ def printlist(x, width=70, indent=4):
 #     test_pep277
 #         The _ExpectedSkips constructor adds this to the set of expected
 #         skips if not os.path.supports_unicode_filenames.
-#     test_socket_ssl
-#         Controlled by test_socket_ssl.skip_expected.  Requires the network
-#         resource, and a socket module with ssl support.
 #     test_timeout
 #         Controlled by test_timeout.skip_expected.  Requires the network
 #         resource and a socket module.
@@ -1057,7 +1054,6 @@ _expectations = {
         test_ossaudiodev
         test_pep277
         test_pty
-        test_socket_ssl
         test_socketserver
         test_tcl
         test_tk
@@ -1145,14 +1141,6 @@ class _ExpectedSkips:
             if not os.path.supports_unicode_filenames:
                 self.expected.add('test_pep277')
 
-            try:
-                from test import test_socket_ssl
-            except ImportError:
-                pass
-            else:
-                if test_socket_ssl.skip_expected:
-                    self.expected.add('test_socket_ssl')
-
             if test_timeout.skip_expected:
                 self.expected.add('test_timeout')