summaryrefslogtreecommitdiffstats
path: root/Lib/SocketServer.py
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2011-11-04 09:15:57 (GMT)
committerFlorent Xicluna <florent.xicluna@gmail.com>2011-11-04 09:15:57 (GMT)
commit5f761d79c0578c24f72663493915b8975e246fbd (patch)
tree4eb7b006ebca307d40e3f694fc4b400179388dc0 /Lib/SocketServer.py
parent09f871462f2b6cd53daf7cb43e861737af9ebc52 (diff)
downloadcpython-5f761d79c0578c24f72663493915b8975e246fbd.zip
cpython-5f761d79c0578c24f72663493915b8975e246fbd.tar.gz
cpython-5f761d79c0578c24f72663493915b8975e246fbd.tar.bz2
Issue #13140: Fix the daemon_threads attribute of ThreadingMixIn.
Diffstat (limited to 'Lib/SocketServer.py')
-rw-r--r--Lib/SocketServer.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/SocketServer.py b/Lib/SocketServer.py
index 71b9caa..2ff3888 100644
--- a/Lib/SocketServer.py
+++ b/Lib/SocketServer.py
@@ -589,8 +589,7 @@ class ThreadingMixIn:
"""Start a new thread to process the request."""
t = threading.Thread(target = self.process_request_thread,
args = (request, client_address))
- if self.daemon_threads:
- t.setDaemon (1)
+ t.daemon = self.daemon_threads
t.start()