Merge branch '2.10'

2 files changed, 3 insertions, 3 deletions

diff --git a/tests/loop.py b/tests/loop.py
index 87fb089a..6de4b164 100644
--- a/tests/loop.py
+++ b/tests/loop.py
@@ -81,7 +81,7 @@ class LoopSocket(object):
         self.__lock.acquire()
         try:
             self.__in_buffer += data
-            self.__cv.notifyAll()
+            self.__cv.notify_all()
         finally:
             self.__lock.release()
 
diff --git a/tests/test_transport.py b/tests/test_transport.py
index 8e5f8cd7..b26d36cd 100644
--- a/tests/test_transport.py
+++ b/tests/test_transport.py
@@ -756,7 +756,7 @@ class TransportTest(unittest.TestCase):
                 threading.Thread.__init__(
                     self, None, None, self.__class__.__name__
                 )
-                self.setDaemon(True)
+                self.daemon = True
                 self.chan = chan
                 self.iterations = iterations
                 self.done_event = done_event
@@ -780,7 +780,7 @@ class TransportTest(unittest.TestCase):
                 threading.Thread.__init__(
                     self, None, None, self.__class__.__name__
                 )
-                self.setDaemon(True)
+                self.daemon = True
                 self.chan = chan
                 self.done_event = done_event
                 self.watchdog_event = threading.Event()