Skip to content

Commit 5694179

Browse files
committed
doc: minor copy-edits
1 parent 7bad794 commit 5694179

18 files changed

+167
-165
lines changed

doc/basics.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ execnet ad-hoc instantiates local and remote Python interpreters.
66
Each interpreter is accessible through a **Gateway** which manages
77
code and data communication. **Channels** allow to exchange
88
data between the local and the remote end. **Groups**
9-
help to manage creation and termination of sub interpreters.
9+
help to manage creation and termination of sub-interpreters.
1010

1111
.. image:: _static/basic1.png
1212

@@ -26,10 +26,10 @@ Here is an example which instantiates a simple Python subprocess::
2626

2727
>>> gateway = execnet.makegateway()
2828

29-
gateways allow to `remote execute code`_ and
29+
Gateways allow to `remote execute code`_ and
3030
`exchange data`_ bidirectionally.
3131

32-
examples for valid gateway specifications
32+
Examples for valid gateway specifications
3333
-------------------------------------------
3434

3535
* ``ssh=wyvern//python=python3.3//chdir=mycache`` specifies a Python3.3
@@ -82,15 +82,15 @@ in the instantiated subprocess-interpreter:
8282
.. automethod:: Gateway.remote_exec(source)
8383

8484
It is allowed to pass a module object as source code
85-
in which case it's source code will be obtained and
85+
in which case its source code will be obtained and
8686
get sent for remote execution. ``remote_exec`` returns
8787
a channel object whose symmetric counterpart channel
8888
is available to the remotely executing source.
8989

9090

9191
.. method:: Gateway.reconfigure([py2str_as_py3str=True, py3str_as_py2str=False])
9292

93-
reconfigures the string-coercion behaviour of the gateway
93+
Reconfigures the string-coercion behaviour of the gateway
9494

9595
.. _`Channel`:
9696
.. _`channel-api`:
@@ -167,7 +167,7 @@ you can execute this little test file::
167167
How to execute in the main thread
168168
------------------------------------------------
169169

170-
When the remote side of a gateway uses the 'thread' model, execution
170+
When the remote side of a gateway uses the "thread" model, execution
171171
will preferably run in the main thread. This allows GUI loops
172172
or other code to behave correctly. If you, however, start multiple
173173
executions concurrently, they will run in non-main threads.
@@ -220,7 +220,7 @@ configure a tracing mechanism:
220220
.. _`dumps/loads`:
221221
.. _`dumps/loads API`:
222222

223-
cross-interpreter serialization of python objects
223+
Cross-interpreter serialization of Python objects
224224
=======================================================
225225

226226
.. versionadded:: 1.1

doc/example/test_debug.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
Debugging execnet / Wire messages
2+
Debugging execnet / wire messages
33
===============================================================
44

55
By setting the environment variable ``EXECNET_DEBUG`` you can

doc/example/test_group.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Usings Groups for managing multiple gateways
55
------------------------------------------------------
66

77
Use ``execnet.Group`` to manage membership and lifetime of
8-
of multiple gateways::
8+
multiple gateways::
99

1010
>>> import execnet
1111
>>> group = execnet.Group(['popen'] * 2)
@@ -25,7 +25,7 @@ of multiple gateways::
2525
>>> group
2626
<Group []>
2727

28-
Assigning Gateway IDs
28+
Assigning gateway IDs
2929
------------------------------------------------------
3030

3131
All gateways are created as part of a group and receive
@@ -66,12 +66,12 @@ you actually use the ``execnet.default_group``::
6666
>>> execnet.default_group.defaultspec # used for empty makegateway() calls
6767
'popen'
6868

69-
Robust Termination of ssh/popen processes
69+
Robust termination of SSH/popen processes
7070
-----------------------------------------------
7171

7272
Use ``group.terminate(timeout)`` if you want to terminate
73-
member gateways and ensure that no local sub processes remain
74-
you can specify a ``timeout`` after which an attempt at killing
73+
member gateways and ensure that no local subprocesses remain.
74+
You can specify a ``timeout`` after which an attempt at killing
7575
the related process is made::
7676

7777
>>> import execnet
@@ -86,7 +86,7 @@ the related process is made::
8686

8787
execnet aims to provide totally robust termination so if
8888
you have left-over processes or other termination issues
89-
please :doc:`report them <../support>`. thanks!
89+
please :doc:`report them <../support>`. Thanks!
9090

9191

9292
Using Groups to manage a certain type of gateway

doc/example/test_info.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
basic local and remote communication
2-
=========================================
1+
Basic local and remote communication
2+
====================================
33

44
Execute source code in subprocess, communicate through a channel
55
-------------------------------------------------------------------
@@ -25,8 +25,8 @@ messages between two processes.
2525

2626
.. _`share-nothing model`: http://en.wikipedia.org/wiki/Shared_nothing_architecture
2727

28-
remote-exec a function (avoiding inlined source part I)
29-
-------------------------------------------------------------------
28+
Remote-exec a function (avoiding inlined source part I)
29+
-------------------------------------------------------
3030

3131
You can send and remote execute parametrized pure functions like this:
3232

@@ -49,8 +49,8 @@ Notes:
4949
between the nodes).
5050

5151

52-
remote-exec a module (avoiding inlined source part II)
53-
--------------------------------------------------------------
52+
Remote-exec a module (avoiding inlined source part II)
53+
------------------------------------------------------
5454

5555
You can pass a module object to ``remote_exec`` in which case
5656
its source code will be sent. No dependencies will be transferred
@@ -86,8 +86,8 @@ A local subprocess gateway has the same working directory as the instantiatior::
8686

8787
"ssh" gateways default to the login home directory.
8888

89-
Get information from remote ssh account
90-
--------------------------------------------
89+
Get information from remote SSH account
90+
---------------------------------------
9191

9292
Use simple execution to obtain information from remote environments::
9393

@@ -143,7 +143,7 @@ and use it to transfer information::
143143

144144

145145

146-
a simple command loop pattern
146+
A simple command loop pattern
147147
--------------------------------------------------------------
148148

149149
If you want the remote side to serve a number
@@ -189,6 +189,6 @@ itself into the remote socket endpoint::
189189
gw = execnet.makegateway("socket=TARGET-IP:8888")
190190

191191
That's it, you can now use the gateway object just like
192-
a popen- or ssh-based one.
192+
a popen- or SSH-based one.
193193

194194
.. include:: test_ssh_fileserver.rst

doc/example/test_multi.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
advanced (multi) channel communication
1+
Advanced (multi) channel communication
22
=====================================================
33

44
MultiChannel: container for multiple channels
@@ -19,7 +19,7 @@ Use ``execnet.MultiChannel`` to work with multiple channels::
1919
>>> sum(mch.receive_each())
2020
3
2121

22-
receive results from sub processes with a Queue
22+
Receive results from sub processes with a Queue
2323
-----------------------------------------------------
2424

2525
Use ``MultiChannel.make_receive_queue()`` to get a queue
@@ -52,7 +52,7 @@ data immediately and without blocking execution::
5252
Note that the callback function will be executed in the
5353
receiver thread and should not block or run for too long.
5454

55-
robustly receive results and termination notification
55+
Robustly receive results and termination notification
5656
-----------------------------------------------------
5757

5858
Use ``MultiChannel.make_receive_queue(endmarker)`` to specify
@@ -76,7 +76,7 @@ is blocked in execution and is terminated/killed::
7676

7777

7878

79-
saturate multiple Hosts and CPUs with tasks to process
79+
Saturate multiple Hosts and CPUs with tasks to process
8080
--------------------------------------------------------
8181

8282
If you have multiple CPUs or hosts you can create as many

doc/example/test_proxy.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
Managing Proxied gateways
1+
Managing proxied gateways
22
==========================
33

4-
Simple Proxying
4+
Simple proxying
55
----------------
66

7-
Using the via arg of specs we can create a gateway
7+
Using the ``via`` arg of specs we can create a gateway
88
whose io is created on a remote gateway and proxied to the master.
99

1010
The simplest use case, is where one creates one master process

doc/example/test_ssh_fileserver.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Receive file contents from remote SSH account
32
-----------------------------------------------------
43

doc/implnotes.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
21
gateway_base.py
32
----------------------
43

5-
the code of this module is sent to the "other side"
4+
The code of this module is sent to the "other side"
65
as a means of bootstrapping a Gateway object
76
capable of receiving and executing code,
87
and routing data through channels.

doc/index.rst

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
2-
31
.. image:: _static/pythonring.png
42
:align: right
53

@@ -17,9 +15,9 @@ communication for distributing execution across many Python interpreters
1715
across version, platform and network barriers. It has
1816
a minimal and fast API targeting the following uses:
1917

20-
* distribute tasks to (many) local or remote CPUs
21-
* write and deploy hybrid multi-process applications
22-
* write scripts to administer multiple environments
18+
* Distribute tasks to (many) local or remote CPUs
19+
* Write and deploy hybrid multi-process applications
20+
* Write scripts to administer multiple environments
2321

2422
.. _`channel-send/receive`: http://en.wikipedia.org/wiki/Channel_(programming)
2523
.. _`share-nothing model`: http://en.wikipedia.org/wiki/Shared_nothing_architecture
@@ -30,25 +28,25 @@ a minimal and fast API targeting the following uses:
3028
Features
3129
------------------
3230

33-
* automatic bootstrapping: no manual remote installation.
31+
* Automatic bootstrapping: no manual remote installation.
3432

35-
* safe and simple serialization of python builtin
33+
* Safe and simple serialization of Python builtin
3634
types for sending/receiving structured data messages.
3735
(New in 1.1) execnet offers a new :ref:`dumps/loads <dumps/loads>`
3836
API which allows cross-interpreter compatible serialization
3937
of Python builtin types.
4038

41-
* flexible communication: synchronous send/receive as well as
39+
* Flexible communication: synchronous send/receive as well as
4240
callback/queue mechanisms supported
4341

44-
* easy creation, handling and termination of multiple processes
42+
* Easy creation, handling and termination of multiple processes
4543

46-
* well tested interactions between CPython 2.5-2.7, CPython-3.3, Jython 2.5.1
44+
* Well tested interactions between CPython 2.5-2.7, CPython-3.3, Jython 2.5.1
4745
and PyPy interpreters.
4846

49-
* fully interoperable between Windows and Unix-ish systems.
47+
* Fully interoperable between Windows and Unix-ish systems.
5048

51-
* many tested :doc:`examples`
49+
* Many tested :doc:`examples`
5250

5351
Known uses
5452
-------------------
@@ -64,7 +62,7 @@ Known uses
6462
* Ronny Pfannschmidt uses it for his `anyvc`_ VCS-abstraction project
6563
to bridge the Python2/Python3 version gap.
6664

67-
* sysadmins and developers are using it for ad-hoc custom scripting
65+
* Sysadmins and developers are using it for ad-hoc custom scripting
6866

6967
.. _`quora`: http://quora.com
7068
.. _`connecting CPython and PyPy`: http://www.quora.com/Quora-Infrastructure/Did-Quoras-switch-to-PyPy-result-in-increased-memory-consumption
@@ -87,7 +85,6 @@ used as backend of the popular `pytest-xdist <https://github.com/pytest-dev/pyte
8785
since version 1.2.
8886

8987
.. _`basic API`: basics.html
90-
.. _`actively developed`: https://github.com/pytest-dev/execnet
9188
.. _`Holger Krekel`: http://twitter.com/hpk42
9289

9390
.. toctree::

doc/support.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ Contact and Support channels
44
If you have interest, questions, issues or suggestions you
55
are welcome to:
66

7-
* join `execnet-dev`_ for general discussions
8-
* join `execnet-commit`_ to be notified of changes
9-
* clone the `github repository`_ and submit patches
10-
* hang out on the #pytest channel on `irc.libera.chat <ircs://irc.libera.chat/#pytest>`_
7+
* Join `execnet-dev`_ for general discussions
8+
* Join `execnet-commit`_ to be notified of changes
9+
* Clone the `github repository`_ and submit patches
10+
* Hang out on the #pytest channel on `irc.libera.chat <ircs://irc.libera.chat/#pytest>`_
1111
(using an IRC client, via `webchat <https://web.libera.chat/#pytest>`_,
1212
or `via Matrix <https://matrix.to/#/%23pytest:libera.chat>`_).
1313

0 commit comments

Comments
 (0)