[Python-3000-checkins] r65837 - in python/branches/py3k: Lib/test/test_ssl.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Mon Aug 18 23:11:09 2008
New Revision: 65837

Log:
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
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_ssl.py

Modified: python/branches/py3k/Lib/test/test_ssl.py
==============================================================================
--- python/branches/py3k/Lib/test/test_ssl.py	(original)
+++ python/branches/py3k/Lib/test/test_ssl.py	Mon Aug 18 23:11:09 2008
@@ -201,7 +201,7 @@
                 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 @@
             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 @@
             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 @@
             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)