diff options
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/includes/mp_distributing.py | 12 | ||||
-rw-r--r-- | Doc/includes/mp_pool.py | 2 | ||||
-rw-r--r-- | Doc/includes/mp_synchronize.py | 2 | ||||
-rw-r--r-- | Doc/includes/mp_webserver.py | 2 | ||||
-rw-r--r-- | Doc/includes/mp_workers.py | 2 | ||||
-rw-r--r-- | Doc/library/multiprocessing.rst | 20 |
6 files changed, 20 insertions, 20 deletions
diff --git a/Doc/includes/mp_distributing.py b/Doc/includes/mp_distributing.py index 5cd12bb..7acefb8 100644 --- a/Doc/includes/mp_distributing.py +++ b/Doc/includes/mp_distributing.py @@ -17,10 +17,10 @@ import shutil import subprocess import logging import itertools -import Queue +import queue try: - import cPickle as pickle + import pickle as pickle except ImportError: import pickle @@ -152,7 +152,7 @@ class DistributedPool(pool.Pool): def LocalProcess(**kwds): p = Process(**kwds) - p.set_name('localhost/' + p.get_name()) + p.set_name('localhost/' + p.name) return p class Cluster(managers.SyncManager): @@ -210,7 +210,7 @@ class Cluster(managers.SyncManager): self._base_shutdown() def Process(self, group=None, target=None, name=None, args=(), kwargs={}): - slot = self._slot_iterator.next() + slot = next(self._slot_iterator) return slot.Process( group=group, target=target, name=name, args=args, kwargs=kwargs ) @@ -231,7 +231,7 @@ class Cluster(managers.SyncManager): # Queue subclass used by distributed pool # -class SettableQueue(Queue.Queue): +class SettableQueue(queue.Queue): def empty(self): return not self.queue def full(self): @@ -243,7 +243,7 @@ class SettableQueue(Queue.Queue): try: self.queue.clear() self.queue.extend(contents) - self.not_empty.notify_all() + self.not_empty.notifyAll() finally: self.not_empty.release() diff --git a/Doc/includes/mp_pool.py b/Doc/includes/mp_pool.py index b937b86..e7aaaac 100644 --- a/Doc/includes/mp_pool.py +++ b/Doc/includes/mp_pool.py @@ -14,7 +14,7 @@ import sys def calculate(func, args): result = func(*args) return '%s says that %s%s = %s' % ( - multiprocessing.current_process().get_name(), + multiprocessing.current_process().name, func.__name__, args, result ) diff --git a/Doc/includes/mp_synchronize.py b/Doc/includes/mp_synchronize.py index 8cf11bd..ddcd338 100644 --- a/Doc/includes/mp_synchronize.py +++ b/Doc/includes/mp_synchronize.py @@ -224,7 +224,7 @@ def test_sharedvalues(): p.start() p.join() - assert p.get_exitcode() == 0 + assert p.exitcode == 0 #### diff --git a/Doc/includes/mp_webserver.py b/Doc/includes/mp_webserver.py index 15d2b6b..4943f5d 100644 --- a/Doc/includes/mp_webserver.py +++ b/Doc/includes/mp_webserver.py @@ -21,7 +21,7 @@ if sys.platform == 'win32': def note(format, *args): - sys.stderr.write('[%s]\t%s\n' % (current_process().get_name(),format%args)) + sys.stderr.write('[%s]\t%s\n' % (current_process().name, format%args)) class RequestHandler(SimpleHTTPRequestHandler): diff --git a/Doc/includes/mp_workers.py b/Doc/includes/mp_workers.py index 795e6cb..07e4cdd 100644 --- a/Doc/includes/mp_workers.py +++ b/Doc/includes/mp_workers.py @@ -29,7 +29,7 @@ def worker(input, output): def calculate(func, args): result = func(*args) return '%s says that %s%s = %s' % \ - (current_process().get_name(), func.__name__, args, result) + (current_process().name, func.__name__, args, result) # # Functions referenced by tasks diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index 10ccb17..4bbd94c 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -290,11 +290,11 @@ The :mod:`multiprocessing` package mostly replicates the API of the A process cannot join itself because this would cause a deadlock. It is an error to attempt to join a process before it has been started. - .. method:: get_name() + .. attribute:: Process.name Return the process's name. - .. method:: set_name(name) + .. attribute:: Process.name = name Set the process's name. @@ -309,11 +309,11 @@ The :mod:`multiprocessing` package mostly replicates the API of the Roughly, a process object is alive from the moment the :meth:`start` method returns until the child process terminates. - .. method:: is_daemon() + .. attribute:: Process.daemon - Return the process's daemon flag. + Return the process's daemon flag., this is a boolean. - .. method:: set_daemon(daemonic) + .. attribute:: Process.daemon = daemonic Set the process's daemon flag to the Boolean value *daemonic*. This must be called before :meth:`start` is called. @@ -329,18 +329,18 @@ The :mod:`multiprocessing` package mostly replicates the API of the In addition process objects also support the following methods: - .. method:: get_pid() + .. attribute:: Process.pid Return the process ID. Before the process is spawned, this will be ``None``. - .. method:: get_exit_code() + .. attribute:: Process.exitcode Return the child's exit code. This will be ``None`` if the process has not yet terminated. A negative value *-N* indicates that the child was terminated by signal *N*. - .. method:: get_auth_key() + .. attribute:: Process.authkey Return the process's authentication key (a byte string). @@ -349,11 +349,11 @@ The :mod:`multiprocessing` package mostly replicates the API of the When a :class:`Process` object is created, it will inherit the authentication key of its parent process, although this may be changed - using :meth:`set_auth_key` below. + using :attr:`Process.authkey` below. See :ref:`multiprocessing-auth-keys`. - .. method:: set_auth_key(authkey) + .. attribute:: Process.authkey = authkey Set the process's authentication key which must be a byte string. |