From 4171da5c9d899dc64cb15f177f05b9de05563148 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Mon, 18 Aug 2008 21:11:09 +0000 Subject: Merged revisions 65829 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r65829 | benjamin.peterson | 2008-08-18 13:39:57 -0500 (Mon, 18 Aug 2008) | 1 line fix old API names in test_ssl ........ --- Lib/test/test_ssl.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index a40a35d..1ad6f02 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -201,7 +201,7 @@ else: self.sock.setblocking(1) self.sslconn = None threading.Thread.__init__(self) - self.set_daemon(True) + self.daemon = True def wrap_conn (self): try: @@ -326,7 +326,7 @@ else: self.flag = None self.active = False threading.Thread.__init__(self) - self.set_daemon(False) + self.daemon = True def start (self, flag=None): self.flag = flag @@ -482,7 +482,7 @@ else: self.server = self.HTTPSServer( (HOST, self.port), self.RootedHTTPRequestHandler, certfile) threading.Thread.__init__(self) - self.set_daemon(True) + self.daemon = True def __str__(self): return "<%s %s>" % (self.__class__.__name__, self.server) @@ -568,7 +568,7 @@ else: self.port = support.find_unused_port() self.server = self.EchoServer(self.port, certfile) threading.Thread.__init__(self) - self.set_daemon(True) + self.daemon = True def __str__(self): return "<%s %s>" % (self.__class__.__name__, self.server) -- cgit v0.12