Skip to content

Commit a0dfa82

Browse files
benjaminpbenjaminp
committed
Merged revisions 75149,75260-75263,75265-75267,75292,75300,75376,75405,75429-75433,75437,75445,75501,75551,75572,75589-75591,75657,75742,75868,75952-75957,76057,76105,76139,76143,76162,76223 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r75149 | gregory.p.smith | 2009-09-29 16:56:31 -0500 (Tue, 29 Sep 2009) | 3 lines Mention issue6972 in extractall docs about overwriting things outside of the supplied path. ........ r75260 | andrew.kuchling | 2009-10-05 16:24:20 -0500 (Mon, 05 Oct 2009) | 1 line Wording fix ........ r75261 | andrew.kuchling | 2009-10-05 16:24:35 -0500 (Mon, 05 Oct 2009) | 1 line Fix narkup ........ r75262 | andrew.kuchling | 2009-10-05 16:25:03 -0500 (Mon, 05 Oct 2009) | 1 line Document 'skip' parameter to constructor ........ r75263 | andrew.kuchling | 2009-10-05 16:25:35 -0500 (Mon, 05 Oct 2009) | 1 line Note side benefit of socket.create_connection() ........ r75265 | andrew.kuchling | 2009-10-05 17:31:11 -0500 (Mon, 05 Oct 2009) | 1 line Reword sentence ........ r75266 | andrew.kuchling | 2009-10-05 17:32:48 -0500 (Mon, 05 Oct 2009) | 1 line Use standard comma punctuation; reword some sentences in the docs ........ r75267 | andrew.kuchling | 2009-10-05 17:42:56 -0500 (Mon, 05 Oct 2009) | 1 line Backport r73983: Document the thousands separator. ........ r75292 | benjamin.peterson | 2009-10-08 22:11:36 -0500 (Thu, 08 Oct 2009) | 1 line death to old CVS keyword ........ r75300 | benjamin.peterson | 2009-10-09 16:48:14 -0500 (Fri, 09 Oct 2009) | 1 line fix some coding style ........ r75376 | benjamin.peterson | 2009-10-11 20:26:07 -0500 (Sun, 11 Oct 2009) | 1 line platform we don't care about ........ r75405 | neil.schemenauer | 2009-10-14 12:17:14 -0500 (Wed, 14 Oct 2009) | 4 lines Issue #1754094: Improve the stack depth calculation in the compiler. There should be no other effect than a small decrease in memory use. Patch by Christopher Tur Lesniewski-Laas. ........ r75429 | benjamin.peterson | 2009-10-14 20:47:28 -0500 (Wed, 14 Oct 2009) | 1 line pep8ify if blocks ........ r75430 | benjamin.peterson | 2009-10-14 20:49:37 -0500 (Wed, 14 Oct 2009) | 1 line use floor division and add a test that exercises the tabsize codepath ........ r75431 | benjamin.peterson | 2009-10-14 20:56:25 -0500 (Wed, 14 Oct 2009) | 1 line change test to what I intended ........ r75432 | benjamin.peterson | 2009-10-14 22:05:39 -0500 (Wed, 14 Oct 2009) | 1 line some cleanups ........ r75433 | benjamin.peterson | 2009-10-14 22:06:55 -0500 (Wed, 14 Oct 2009) | 1 line make inspect.isabstract() always return a boolean; add a test for it, too python#7069 ........ r75437 | benjamin.peterson | 2009-10-15 10:44:46 -0500 (Thu, 15 Oct 2009) | 1 line only clear a module's __dict__ if the module is the only one with a reference to it python#7140 ........ r75445 | vinay.sajip | 2009-10-16 09:06:44 -0500 (Fri, 16 Oct 2009) | 1 line Issue python#7120: logging: Removed import of multiprocessing which is causing crash in GAE. ........ r75501 | antoine.pitrou | 2009-10-18 13:37:11 -0500 (Sun, 18 Oct 2009) | 3 lines Add a comment about unreachable code, and fix a typo ........ r75551 | benjamin.peterson | 2009-10-19 22:14:10 -0500 (Mon, 19 Oct 2009) | 1 line use property api ........ r75572 | benjamin.peterson | 2009-10-20 16:55:17 -0500 (Tue, 20 Oct 2009) | 1 line clarify buffer arg python#7178 ........ r75589 | benjamin.peterson | 2009-10-21 21:26:47 -0500 (Wed, 21 Oct 2009) | 1 line whitespace ........ r75590 | benjamin.peterson | 2009-10-21 21:36:47 -0500 (Wed, 21 Oct 2009) | 1 line rewrite to be nice to other implementations ........ r75591 | benjamin.peterson | 2009-10-21 21:50:38 -0500 (Wed, 21 Oct 2009) | 4 lines rewrite for style, clarify, and comments Also, use the hasattr() like scheme of allowing BaseException exceptions through. ........ r75657 | antoine.pitrou | 2009-10-24 07:41:27 -0500 (Sat, 24 Oct 2009) | 3 lines Fix compilation error in debug mode. ........ r75742 | benjamin.peterson | 2009-10-26 17:51:16 -0500 (Mon, 26 Oct 2009) | 1 line use 'is' instead of id() ........ r75868 | benjamin.peterson | 2009-10-27 15:59:18 -0500 (Tue, 27 Oct 2009) | 1 line test expect base classes ........ r75952 | georg.brandl | 2009-10-29 15:38:32 -0500 (Thu, 29 Oct 2009) | 1 line Use the correct function name in docstring. ........ r75953 | georg.brandl | 2009-10-29 15:39:50 -0500 (Thu, 29 Oct 2009) | 1 line Remove mention of the old -X command line switch. ........ r75954 | georg.brandl | 2009-10-29 15:53:00 -0500 (Thu, 29 Oct 2009) | 1 line Use constants instead of magic integers for test result. Do not re-run with --verbose3 for environment changing tests. ........ r75955 | georg.brandl | 2009-10-29 15:54:03 -0500 (Thu, 29 Oct 2009) | 1 line Use a single style for all the docstrings in the math module. ........ r75956 | georg.brandl | 2009-10-29 16:16:34 -0500 (Thu, 29 Oct 2009) | 1 line I do not think the "railroad" program mentioned is still available. ........ r75957 | georg.brandl | 2009-10-29 16:44:56 -0500 (Thu, 29 Oct 2009) | 1 line Fix constant name. ........ r76057 | benjamin.peterson | 2009-11-02 09:06:45 -0600 (Mon, 02 Nov 2009) | 1 line prevent a rather unlikely segfault ........ r76105 | georg.brandl | 2009-11-04 01:38:12 -0600 (Wed, 04 Nov 2009) | 1 line python#7259: show correct equivalent for operator.i* operations in docstring; fix minor issues in operator docs. ........ r76139 | benjamin.peterson | 2009-11-06 19:04:38 -0600 (Fri, 06 Nov 2009) | 1 line spelling ........ r76143 | georg.brandl | 2009-11-07 02:26:07 -0600 (Sat, 07 Nov 2009) | 1 line python#7271: fix typo. ........ r76162 | benjamin.peterson | 2009-11-08 22:10:53 -0600 (Sun, 08 Nov 2009) | 1 line discuss how to use -p ........ r76223 | georg.brandl | 2009-11-12 02:29:46 -0600 (Thu, 12 Nov 2009) | 1 line Give the profile module a module directive. ........
1 parent 0089d75 commit a0dfa82

33 files changed

Lines changed: 347 additions & 219 deletions

‎Doc/distutils/apiref.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1952,7 +1952,7 @@ This is described in more detail in :pep:`301`.
19521952

19531953

19541954
The ``check`` command performs some tests on the meta-data of a package.
1955-
It makes sure for example that all required meta-data are provided through
1955+
For example, it verifies that all required meta-data are provided as
19561956
the arguments passed to the :func:`setup` function.
19571957

19581958
.. % todo

‎Doc/distutils/examples.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,10 +236,10 @@ With exactly the same source tree layout, this extension can be put in the
236236
Checking a package
237237
==================
238238

239-
The ``check`` command allows you to verify if your package meta-data are
240-
meeting the minimum requirements to build a distribution.
239+
The ``check`` command allows you to verify if your package meta-data
240+
meet the minimum requirements to build a distribution.
241241

242-
To run it, just call it over your :file:`setup.py` script. If something is
242+
To run it, just call it using your :file:`setup.py` script. If something is
243243
missing, ``check`` will display a warning.
244244

245245
Let's take an example with a simple script::
@@ -252,7 +252,7 @@ Running the ``check`` command will display some warnings::
252252

253253
$ python setup.py check
254254
running check
255-
warning: check: missing required meta-data: version ,url
255+
warning: check: missing required meta-data: version, url
256256
warning: check: missing meta-data: either (author and author_email) or
257257
(maintainer and maintainer_email) must be supplied
258258

‎Doc/library/2to3.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,14 @@ document could also be refactored with this option.
8686
The :option:`-v` option enables output of more information on the translation
8787
process.
8888

89+
Since some print statements can be parsed as function calls or statements, 2to3
90+
cannot always read files containing the print function. When 2to3 detects the
91+
presence of the ``from __future__ import print_function`` compiler directive, it
92+
modifies its internal grammar to interpert :func:`print` as a function. This
93+
change can also be enabled manually with the :option:`-p` flag. Use
94+
:option:`-p` to run fixers on code that already has had its print statements
95+
converted.
96+
8997

9098
.. _2to3-fixers:
9199

‎Doc/library/bdb.rst‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,22 @@ The :mod:`bdb` module also defines two classes:
6262
* The breakpoint hit count.
6363

6464

65-
.. class:: Bdb()
65+
.. class:: Bdb(skip=None)
6666

67-
The :class:`Bdb` acts as a generic Python debugger base class.
67+
The :class:`Bdb` class acts as a generic Python debugger base class.
6868

6969
This class takes care of the details of the trace facility; a derived class
7070
should implement user interaction. The standard debugger class
7171
(:class:`pdb.Pdb`) is an example.
7272

73+
The *skip* argument, if given, must be an iterable of glob-style
74+
module name patterns. The debugger will not step into frames that
75+
originate in a module that matches one of these patterns. Whether a
76+
frame is considered to originate in a certain module is determined
77+
by the ``__name__`` in the frame globals.
78+
79+
.. versionadded:: 2.7
80+
The *skip* argument.
7381

7482
The following methods of :class:`Bdb` normally don't need to be overridden.
7583

‎Doc/library/io.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ Module Interface
9898

9999
*buffering* is an optional integer used to set the buffering policy. By
100100
default full buffering is on. Pass 0 to switch buffering off (only allowed
101-
in binary mode), 1 to set line buffering, and an integer > 1 for full
102-
buffering.
101+
in binary mode), 1 to set line buffering, and an integer > 1 to indicate the
102+
size of the buffer.
103103

104104
*encoding* is the name of the encoding used to decode or encode the file.
105105
This should only be used in text mode. The default encoding is platform

‎Doc/library/operator.rst‎

Lines changed: 84 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,14 @@ The mathematical and bitwise operations are the most numerous:
104104
Return ``a // b``.
105105

106106

107+
.. function:: index(a)
108+
__index__(a)
109+
110+
Return *a* converted to an integer. Equivalent to ``a.__index__()``.
111+
112+
.. versionadded:: 2.5
113+
114+
107115
.. function:: inv(obj)
108116
invert(obj)
109117
__inv__(obj)
@@ -133,7 +141,7 @@ The mathematical and bitwise operations are the most numerous:
133141
.. function:: neg(obj)
134142
__neg__(obj)
135143

136-
Return *obj* negated.
144+
Return *obj* negated (``-obj``).
137145

138146

139147
.. function:: or_(a, b)
@@ -145,7 +153,7 @@ The mathematical and bitwise operations are the most numerous:
145153
.. function:: pos(obj)
146154
__pos__(obj)
147155

148-
Return *obj* positive.
156+
Return *obj* positive (``+obj``).
149157

150158

151159
.. function:: pow(a, b)
@@ -179,13 +187,7 @@ The mathematical and bitwise operations are the most numerous:
179187
Return the bitwise exclusive or of *a* and *b*.
180188

181189

182-
.. function:: index(a)
183-
__index__(a)
184-
185-
Return *a* converted to an integer. Equivalent to ``a.__index__()``.
186-
187-
188-
Operations which work with sequences include:
190+
Operations which work with sequences (some of them with mappings too) include:
189191

190192
.. function:: concat(a, b)
191193
__concat__(a, b)
@@ -394,67 +396,77 @@ Mapping Operators to Functions
394396
This table shows how abstract operations correspond to operator symbols in the
395397
Python syntax and the functions in the :mod:`operator` module.
396398

397-
+-----------------------+-------------------------+---------------------------------+
398-
| Operation | Syntax | Function |
399-
+=======================+=========================+=================================+
400-
| Addition | ``a + b`` | ``add(a, b)`` |
401-
+-----------------------+-------------------------+---------------------------------+
402-
| Concatenation | ``seq1 + seq2`` | ``concat(seq1, seq2)`` |
403-
+-----------------------+-------------------------+---------------------------------+
404-
| Containment Test | ``obj in seq`` | ``contains(seq, obj)`` |
405-
+-----------------------+-------------------------+---------------------------------+
406-
| Division | ``a / b`` | ``truediv(a, b)`` |
407-
+-----------------------+-------------------------+---------------------------------+
408-
| Division | ``a // b`` | ``floordiv(a, b)`` |
409-
+-----------------------+-------------------------+---------------------------------+
410-
| Bitwise And | ``a & b`` | ``and_(a, b)`` |
411-
+-----------------------+-------------------------+---------------------------------+
412-
| Bitwise Exclusive Or | ``a ^ b`` | ``xor(a, b)`` |
413-
+-----------------------+-------------------------+---------------------------------+
414-
| Bitwise Inversion | ``~ a`` | ``invert(a)`` |
415-
+-----------------------+-------------------------+---------------------------------+
416-
| Bitwise Or | ``a | b`` | ``or_(a, b)`` |
417-
+-----------------------+-------------------------+---------------------------------+
418-
| Exponentiation | ``a ** b`` | ``pow(a, b)`` |
419-
+-----------------------+-------------------------+---------------------------------+
420-
| Identity | ``a is b`` | ``is_(a, b)`` |
421-
+-----------------------+-------------------------+---------------------------------+
422-
| Identity | ``a is not b`` | ``is_not(a, b)`` |
423-
+-----------------------+-------------------------+---------------------------------+
424-
| Indexed Assignment | ``obj[k] = v`` | ``setitem(obj, k, v)`` |
425-
+-----------------------+-------------------------+---------------------------------+
426-
| Indexed Deletion | ``del obj[k]`` | ``delitem(obj, k)`` |
427-
+-----------------------+-------------------------+---------------------------------+
428-
| Indexing | ``obj[k]`` | ``getitem(obj, k)`` |
429-
+-----------------------+-------------------------+---------------------------------+
430-
| Left Shift | ``a << b`` | ``lshift(a, b)`` |
431-
+-----------------------+-------------------------+---------------------------------+
432-
| Modulo | ``a % b`` | ``mod(a, b)`` |
433-
+-----------------------+-------------------------+---------------------------------+
434-
| Multiplication | ``a * b`` | ``mul(a, b)`` |
435-
+-----------------------+-------------------------+---------------------------------+
436-
| Negation (Arithmetic) | ``- a`` | ``neg(a)`` |
437-
+-----------------------+-------------------------+---------------------------------+
438-
| Negation (Logical) | ``not a`` | ``not_(a)`` |
439-
+-----------------------+-------------------------+---------------------------------+
440-
| Right Shift | ``a >> b`` | ``rshift(a, b)`` |
441-
+-----------------------+-------------------------+---------------------------------+
442-
| String Formatting | ``s % obj`` | ``mod(s, obj)`` |
443-
+-----------------------+-------------------------+---------------------------------+
444-
| Subtraction | ``a - b`` | ``sub(a, b)`` |
445-
+-----------------------+-------------------------+---------------------------------+
446-
| Truth Test | ``obj`` | ``truth(obj)`` |
447-
+-----------------------+-------------------------+---------------------------------+
448-
| Ordering | ``a < b`` | ``lt(a, b)`` |
449-
+-----------------------+-------------------------+---------------------------------+
450-
| Ordering | ``a <= b`` | ``le(a, b)`` |
451-
+-----------------------+-------------------------+---------------------------------+
452-
| Equality | ``a == b`` | ``eq(a, b)`` |
453-
+-----------------------+-------------------------+---------------------------------+
454-
| Difference | ``a != b`` | ``ne(a, b)`` |
455-
+-----------------------+-------------------------+---------------------------------+
456-
| Ordering | ``a >= b`` | ``ge(a, b)`` |
457-
+-----------------------+-------------------------+---------------------------------+
458-
| Ordering | ``a > b`` | ``gt(a, b)`` |
459-
+-----------------------+-------------------------+---------------------------------+
399+
+-----------------------+-------------------------+---------------------------------------+
400+
| Operation | Syntax | Function |
401+
+=======================+=========================+=======================================+
402+
| Addition | ``a + b`` | ``add(a, b)`` |
403+
+-----------------------+-------------------------+---------------------------------------+
404+
| Concatenation | ``seq1 + seq2`` | ``concat(seq1, seq2)`` |
405+
+-----------------------+-------------------------+---------------------------------------+
406+
| Containment Test | ``obj in seq`` | ``contains(seq, obj)`` |
407+
+-----------------------+-------------------------+---------------------------------------+
408+
| Division | ``a / b`` | ``div(a, b)`` |
409+
+-----------------------+-------------------------+---------------------------------------+
410+
| Division | ``a // b`` | ``floordiv(a, b)`` |
411+
+-----------------------+-------------------------+---------------------------------------+
412+
| Bitwise And | ``a & b`` | ``and_(a, b)`` |
413+
+-----------------------+-------------------------+---------------------------------------+
414+
| Bitwise Exclusive Or | ``a ^ b`` | ``xor(a, b)`` |
415+
+-----------------------+-------------------------+---------------------------------------+
416+
| Bitwise Inversion | ``~ a`` | ``invert(a)`` |
417+
+-----------------------+-------------------------+---------------------------------------+
418+
| Bitwise Or | ``a | b`` | ``or_(a, b)`` |
419+
+-----------------------+-------------------------+---------------------------------------+
420+
| Exponentiation | ``a ** b`` | ``pow(a, b)`` |
421+
+-----------------------+-------------------------+---------------------------------------+
422+
| Identity | ``a is b`` | ``is_(a, b)`` |
423+
+-----------------------+-------------------------+---------------------------------------+
424+
| Identity | ``a is not b`` | ``is_not(a, b)`` |
425+
+-----------------------+-------------------------+---------------------------------------+
426+
| Indexed Assignment | ``obj[k] = v`` | ``setitem(obj, k, v)`` |
427+
+-----------------------+-------------------------+---------------------------------------+
428+
| Indexed Deletion | ``del obj[k]`` | ``delitem(obj, k)`` |
429+
+-----------------------+-------------------------+---------------------------------------+
430+
| Indexing | ``obj[k]`` | ``getitem(obj, k)`` |
431+
+-----------------------+-------------------------+---------------------------------------+
432+
| Left Shift | ``a << b`` | ``lshift(a, b)`` |
433+
+-----------------------+-------------------------+---------------------------------------+
434+
| Modulo | ``a % b`` | ``mod(a, b)`` |
435+
+-----------------------+-------------------------+---------------------------------------+
436+
| Multiplication | ``a * b`` | ``mul(a, b)`` |
437+
+-----------------------+-------------------------+---------------------------------------+
438+
| Negation (Arithmetic) | ``- a`` | ``neg(a)`` |
439+
+-----------------------+-------------------------+---------------------------------------+
440+
| Negation (Logical) | ``not a`` | ``not_(a)`` |
441+
+-----------------------+-------------------------+---------------------------------------+
442+
| Positive | ``+ a`` | ``pos(a)`` |
443+
+-----------------------+-------------------------+---------------------------------------+
444+
| Right Shift | ``a >> b`` | ``rshift(a, b)`` |
445+
+-----------------------+-------------------------+---------------------------------------+
446+
| Sequence Repetition | ``seq * i`` | ``repeat(seq, i)`` |
447+
+-----------------------+-------------------------+---------------------------------------+
448+
| Slice Assignment | ``seq[i:j] = values`` | ``setitem(seq, slice(i, j), values)`` |
449+
+-----------------------+-------------------------+---------------------------------------+
450+
| Slice Deletion | ``del seq[i:j]`` | ``delitem(seq, slice(i, j))`` |
451+
+-----------------------+-------------------------+---------------------------------------+
452+
| Slicing | ``seq[i:j]`` | ``getitem(seq, slice(i, j))`` |
453+
+-----------------------+-------------------------+---------------------------------------+
454+
| String Formatting | ``s % obj`` | ``mod(s, obj)`` |
455+
+-----------------------+-------------------------+---------------------------------------+
456+
| Subtraction | ``a - b`` | ``sub(a, b)`` |
457+
+-----------------------+-------------------------+---------------------------------------+
458+
| Truth Test | ``obj`` | ``truth(obj)`` |
459+
+-----------------------+-------------------------+---------------------------------------+
460+
| Ordering | ``a < b`` | ``lt(a, b)`` |
461+
+-----------------------+-------------------------+---------------------------------------+
462+
| Ordering | ``a <= b`` | ``le(a, b)`` |
463+
+-----------------------+-------------------------+---------------------------------------+
464+
| Equality | ``a == b`` | ``eq(a, b)`` |
465+
+-----------------------+-------------------------+---------------------------------------+
466+
| Difference | ``a != b`` | ``ne(a, b)`` |
467+
+-----------------------+-------------------------+---------------------------------------+
468+
| Ordering | ``a >= b`` | ``ge(a, b)`` |
469+
+-----------------------+-------------------------+---------------------------------------+
470+
| Ordering | ``a > b`` | ``gt(a, b)`` |
471+
+-----------------------+-------------------------+---------------------------------------+
460472

‎Doc/library/pdb.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ insert ::
5555
import pdb; pdb.set_trace()
5656

5757
at the location you want to break into the debugger. You can then step through
58-
the code following this statement, and continue running without debugger using
58+
the code following this statement, and continue running without the debugger using
5959
the ``c`` command.
6060

6161
The typical usage to inspect a crashed program is::

‎Doc/library/profile.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ The Python Profilers
66

77
.. sectionauthor:: James Roskind
88

9+
.. module:: profile
10+
:synopsis: Python source profiler.
911

1012
.. index:: single: InfoSeek Corporation
1113

‎Doc/library/pty.rst‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
========================================
33

44
.. module:: pty
5-
:platform: IRIX, Linux
6-
:synopsis: Pseudo-Terminal Handling for SGI and Linux.
5+
:platform: Linux
6+
:synopsis: Pseudo-Terminal Handling for Linux.
77
.. moduleauthor:: Steen Lumholt
88
.. sectionauthor:: Moshe Zadka <moshez@zadka.site.co.il>
99

@@ -13,8 +13,8 @@ concept: starting another process and being able to write to and read from its
1313
controlling terminal programmatically.
1414

1515
Because pseudo-terminal handling is highly platform dependent, there is code to
16-
do it only for SGI and Linux. (The Linux code is supposed to work on other
17-
platforms, but hasn't been tested yet.)
16+
do it only for Linux. (The Linux code is supposed to work on other platforms,
17+
but hasn't been tested yet.)
1818

1919
The :mod:`pty` module defines the following functions:
2020

@@ -31,8 +31,8 @@ The :mod:`pty` module defines the following functions:
3131
.. function:: openpty()
3232

3333
Open a new pseudo-terminal pair, using :func:`os.openpty` if possible, or
34-
emulation code for SGI and generic Unix systems. Return a pair of file
35-
descriptors ``(master, slave)``, for the master and the slave end, respectively.
34+
emulation code for generic Unix systems. Return a pair of file descriptors
35+
``(master, slave)``, for the master and the slave end, respectively.
3636

3737

3838
.. function:: spawn(argv[, master_read[, stdin_read]])

‎Doc/library/tarfile.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ object, see :ref:`tarinfo-objects` for details.
365365
value. Depending on this value the respective file is either excluded
366366
(:const:`True`) or added (:const:`False`). If *filter* is specified it must
367367
be a function that takes a :class:`TarInfo` object argument and returns the
368-
changed TarInfo object. If it instead returns :const:`None` the TarInfo
368+
changed :class:`TarInfo` object. If it instead returns :const:`None` the :class:`TarInfo`
369369
object will be excluded from the archive. See :ref:`tar-examples` for an
370370
example.
371371

0 commit comments

Comments
 (0)