issue3352: clean up the multiprocessing API to remove many get_/set_ methods and convert them to properties. Update the docs and the examples included.
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index c3b1c82..b13d1da 100644
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -119,22 +119,22 @@
return
current = self.current_process()
- authkey = current.get_authkey()
+ authkey = current.authkey
self.assertTrue(current.is_alive())
- self.assertTrue(not current.is_daemon())
+ self.assertTrue(not current.daemon)
self.assertTrue(isinstance(authkey, bytes))
self.assertTrue(len(authkey) > 0)
- self.assertEqual(current.get_ident(), os.getpid())
- self.assertEqual(current.get_exitcode(), None)
+ self.assertEqual(current.ident, os.getpid())
+ self.assertEqual(current.exitcode, None)
def _test(self, q, *args, **kwds):
current = self.current_process()
q.put(args)
q.put(kwds)
- q.put(current.get_name())
+ q.put(current.name)
if self.TYPE != 'threads':
- q.put(bytes(current.get_authkey()))
+ q.put(bytes(current.authkey))
q.put(current.pid)
def test_process(self):
@@ -146,33 +146,33 @@
p = self.Process(
target=self._test, args=args, kwargs=kwargs, name=name
)
- p.set_daemon(True)
+ p.daemon = True
current = self.current_process()
if self.TYPE != 'threads':
- self.assertEquals(p.get_authkey(), current.get_authkey())
+ self.assertEquals(p.authkey, current.authkey)
self.assertEquals(p.is_alive(), False)
- self.assertEquals(p.is_daemon(), True)
+ self.assertEquals(p.daemon, True)
self.assertTrue(p not in self.active_children())
self.assertTrue(type(self.active_children()) is list)
- self.assertEqual(p.get_exitcode(), None)
+ self.assertEqual(p.exitcode, None)
p.start()
- self.assertEquals(p.get_exitcode(), None)
+ self.assertEquals(p.exitcode, None)
self.assertEquals(p.is_alive(), True)
self.assertTrue(p in self.active_children())
self.assertEquals(q.get(), args[1:])
self.assertEquals(q.get(), kwargs)
- self.assertEquals(q.get(), p.get_name())
+ self.assertEquals(q.get(), p.name)
if self.TYPE != 'threads':
- self.assertEquals(q.get(), current.get_authkey())
+ self.assertEquals(q.get(), current.authkey)
self.assertEquals(q.get(), p.pid)
p.join()
- self.assertEquals(p.get_exitcode(), 0)
+ self.assertEquals(p.exitcode, 0)
self.assertEquals(p.is_alive(), False)
self.assertTrue(p not in self.active_children())
@@ -184,12 +184,12 @@
return
p = self.Process(target=self._test_terminate)
- p.set_daemon(True)
+ p.daemon = True
p.start()
self.assertEqual(p.is_alive(), True)
self.assertTrue(p in self.active_children())
- self.assertEqual(p.get_exitcode(), None)
+ self.assertEqual(p.exitcode, None)
p.terminate()
@@ -202,8 +202,8 @@
p.join()
- # XXX sometimes get p.get_exitcode() == 0 on Windows ...
- #self.assertEqual(p.get_exitcode(), -signal.SIGTERM)
+ # XXX sometimes get p.exitcode == 0 on Windows ...
+ #self.assertEqual(p.exitcode, -signal.SIGTERM)
def test_cpu_count(self):
try:
@@ -330,7 +330,7 @@
target=self._test_put,
args=(queue, child_can_start, parent_can_continue)
)
- proc.set_daemon(True)
+ proc.daemon = True
proc.start()
self.assertEqual(queue_empty(queue), True)
@@ -396,7 +396,7 @@
target=self._test_get,
args=(queue, child_can_start, parent_can_continue)
)
- proc.set_daemon(True)
+ proc.daemon = True
proc.start()
self.assertEqual(queue_empty(queue), True)
@@ -619,17 +619,11 @@
woken = self.Semaphore(0)
p = self.Process(target=self.f, args=(cond, sleeping, woken))
- try:
- p.set_daemon(True)
- except AttributeError:
- p.daemon = True
+ p.daemon = True
p.start()
p = threading.Thread(target=self.f, args=(cond, sleeping, woken))
- try:
- p.set_daemon(True)
- except AttributeError:
- p.daemon = True
+ p.daemon = True
p.start()
# wait for both children to start sleeping
@@ -671,7 +665,7 @@
for i in range(3):
p = self.Process(target=self.f,
args=(cond, sleeping, woken, TIMEOUT1))
- p.set_daemon(True)
+ p.daemon = True
p.start()
t = threading.Thread(target=self.f,
@@ -694,7 +688,7 @@
# start some more threads/processes
for i in range(3):
p = self.Process(target=self.f, args=(cond, sleeping, woken))
- p.set_daemon(True)
+ p.daemon = True
p.start()
t = threading.Thread(target=self.f, args=(cond, sleeping, woken))
@@ -1191,7 +1185,7 @@
conn, child_conn = self.Pipe()
p = self.Process(target=self._echo, args=(child_conn,))
- p.set_daemon(True)
+ p.daemon = True
p.start()
seq = [1, 2.25, None]
@@ -1340,7 +1334,7 @@
for family in self.connection.families:
l = self.connection.Listener(family=family)
p = self.Process(target=self._test, args=(l.address,))
- p.set_daemon(True)
+ p.daemon = True
p.start()
conn = l.accept()
self.assertEqual(conn.recv(), 'hello')