Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 4469d0c

Browse files
benjaminpbenjaminp
committed
Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from
svn+ssh://[email protected]/python/trunk ........ r67348 | benjamin.peterson | 2008-11-22 20:09:41 -0600 (Sat, 22 Nov 2008) | 1 line raise a better error ........ r67355 | georg.brandl | 2008-11-23 13:17:25 -0600 (Sun, 23 Nov 2008) | 2 lines #4392: fix parameter name. ........ r67359 | georg.brandl | 2008-11-23 15:57:30 -0600 (Sun, 23 Nov 2008) | 2 lines #4399: fix typo. ........ r67362 | gregory.p.smith | 2008-11-23 18:41:43 -0600 (Sun, 23 Nov 2008) | 2 lines Document PY_SSIZE_T_CLEAN for PyArg_ParseTuple. ........ r67364 | benjamin.peterson | 2008-11-23 19:16:29 -0600 (Sun, 23 Nov 2008) | 2 lines replace reference to debugger-hooks ........ r67365 | benjamin.peterson | 2008-11-23 22:09:03 -0600 (Sun, 23 Nov 2008) | 1 line #4396 make the parser module correctly validate the with syntax ........ r67367 | georg.brandl | 2008-11-24 10:16:07 -0600 (Mon, 24 Nov 2008) | 2 lines Fix typo. ........ r67368 | georg.brandl | 2008-11-24 13:56:47 -0600 (Mon, 24 Nov 2008) | 2 lines #4404: make clear what "path" is. ........ r67398 | benjamin.peterson | 2008-11-26 11:39:17 -0600 (Wed, 26 Nov 2008) | 1 line fix typo in sqlite3 docs ........ r67423 | jesse.noller | 2008-11-28 12:59:35 -0600 (Fri, 28 Nov 2008) | 2 lines issue4238: bsd support for cpu_count ........ r67424 | christian.heimes | 2008-11-28 13:33:33 -0600 (Fri, 28 Nov 2008) | 1 line Retain copyright of processing examples. This was requested by a Debian maintainer during packaging of the multiprocessing package for 2.4/2.5 ........ r67432 | benjamin.peterson | 2008-11-28 17:18:46 -0600 (Fri, 28 Nov 2008) | 1 line SVN format 9 is the same it seems ........ r67440 | jeremy.hylton | 2008-11-28 17:42:59 -0600 (Fri, 28 Nov 2008) | 4 lines Move definition int sval into branch of ifdef where it is used. Otherwise, you get a warning about an undefined variable. ........ r67441 | jeremy.hylton | 2008-11-28 18:09:16 -0600 (Fri, 28 Nov 2008) | 2 lines Reflow long lines. ........ r67444 | amaury.forgeotdarc | 2008-11-28 20:03:32 -0600 (Fri, 28 Nov 2008) | 2 lines Fix a small typo in docstring ........ r67445 | benjamin.peterson | 2008-11-29 21:07:33 -0600 (Sat, 29 Nov 2008) | 1 line StringIO.close() stops you from using the buffer, too ........ r67454 | benjamin.peterson | 2008-11-30 08:43:23 -0600 (Sun, 30 Nov 2008) | 1 line note the version that works ........ r67455 | martin.v.loewis | 2008-11-30 13:28:27 -0600 (Sun, 30 Nov 2008) | 1 line Issue #4365: Add crtassem.h constants to the msvcrt module. ........ r67457 | christian.heimes | 2008-11-30 15:16:28 -0600 (Sun, 30 Nov 2008) | 1 line w# requires Py_ssize_t ........ r67458 | benjamin.peterson | 2008-11-30 15:46:16 -0600 (Sun, 30 Nov 2008) | 1 line fix pyspecific extensions that were broken by Sphinx's grand renaming ........
1 parent 1742e40 commit 4469d0c

23 files changed

Lines changed: 129 additions & 34 deletions

‎Doc/c-api/arg.rst‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ variable(s) whose address should be passed.
3232
converted to C strings using the default encoding. If this conversion fails, a
3333
:exc:`UnicodeError` is raised.
3434

35+
Starting with Python 2.5 the type of the length argument can be
36+
controlled by defining the macro :cmacro:`PY_SSIZE_T_CLEAN` before
37+
including :file:`Python.h`. If the macro is defined, length is a
38+
:ctype:`Py_ssize_t` rather than an int.
39+
3540
``s*`` (string, Unicode, or any buffer compatible object) [Py_buffer \*]
3641
This is similar to ``s``, but the code fills a :ctype:`Py_buffer` structure
3742
provided by the caller. In this case the Python string may contain embedded
@@ -43,17 +48,20 @@ variable(s) whose address should be passed.
4348
has processed the data.
4449

4550
``s#`` (string, Unicode or any read buffer compatible object) [const char \*, int or :ctype:`Py_ssize_t`]
46-
This variant on ``s*`` stores into two C variables, the first one a pointer
47-
to a character string, the second one its length. All other read-buffer
48-
compatible objects pass back a reference to the raw internal data
49-
representation. Since this format doesn't allow writable buffer compatible
50-
objects like byte arrays, ``s*`` is to be preferred. The type of
51-
the length argument (int or :ctype:`Py_ssize_t`) is controlled by
51+
This variant on ``s`` stores into two C variables, the first one a pointer to
52+
a character string, the second one its length. In this case the Python
53+
string may contain embedded null bytes. Unicode objects pass back a pointer
54+
to the default encoded string version of the object if such a conversion is
55+
possible. All other read-buffer compatible objects pass back a reference to
56+
the raw internal data representation. Since this format doesn't allow writable buffer compatible objects like byte
57+
arrays, ``s*`` is to be preferred.
58+
59+
The type of the length argument (int or :ctype:`Py_ssize_t`) is controlled by
5260
defining the macro :cmacro:`PY_SSIZE_T_CLEAN` before including
5361
:file:`Python.h`. If the macro was defined, length is a :ctype:`Py_ssize_t`
54-
rather than an int. This behavior will change in a future Python
55-
version to only support :ctype:`Py_ssize_t` and drop int support.
56-
It is best to always define :cmacro:`PY_SSIZE_T_CLEAN`.
62+
rather than an int. This behavior will change in a future Python version to
63+
only support :ctype:`Py_ssize_t` and drop int support. It is best to always
64+
define :cmacro:`PY_SSIZE_T_CLEAN`.
5765

5866
``y`` (bytes object) [const char \*]
5967
This variant on ``s`` converts a Python bytes or bytearray object to a C

‎Doc/includes/mp_benchmarks.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#
22
# Simple benchmarks for the multiprocessing package
33
#
4+
# Copyright (c) 2006-2008, R Oudkerk
5+
# All rights reserved.
6+
#
47

58
import time, sys, multiprocessing, threading, queue, gc
69

‎Doc/includes/mp_distributing.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
#
44
# Depends on `multiprocessing` package -- tested with `processing-0.60`
55
#
6+
# Copyright (c) 2006-2008, R Oudkerk
7+
# All rights reserved.
8+
#
69

710
__all__ = ['Cluster', 'Host', 'get_logger', 'current_process']
811

‎Doc/includes/mp_newtype.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
# This module shows how to use arbitrary callables with a subclass of
33
# `BaseManager`.
44
#
5+
# Copyright (c) 2006-2008, R Oudkerk
6+
# All rights reserved.
7+
#
58

69
from multiprocessing import freeze_support
710
from multiprocessing.managers import BaseManager, BaseProxy

‎Doc/includes/mp_pool.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#
22
# A test of `multiprocessing.Pool` class
33
#
4+
# Copyright (c) 2006-2008, R Oudkerk
5+
# All rights reserved.
6+
#
47

58
import multiprocessing
69
import time

‎Doc/includes/mp_synchronize.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#
22
# A test file for the `multiprocessing` package
33
#
4+
# Copyright (c) 2006-2008, R Oudkerk
5+
# All rights reserved.
6+
#
47

58
import time, sys, random
69
from queue import Empty

‎Doc/includes/mp_webserver.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
# Not sure if we should synchronize access to `socket.accept()` method by
99
# using a process-shared lock -- does not seem to be necessary.
1010
#
11+
# Copyright (c) 2006-2008, R Oudkerk
12+
# All rights reserved.
13+
#
1114

1215
import os
1316
import sys

‎Doc/includes/mp_workers.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
# in the original order then consider using `Pool.map()` or
88
# `Pool.imap()` (which will save on the amount of code needed anyway).
99
#
10+
# Copyright (c) 2006-2008, R Oudkerk
11+
# All rights reserved.
12+
#
1013

1114
import time
1215
import random

‎Doc/library/bdb.rst‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,9 @@ The :mod:`bdb` module also defines two classes:
107107

108108
The *arg* parameter depends on the previous event.
109109

110-
For more information on trace functions, see :ref:`debugger-hooks`. For
111-
more information on code and frame objects, refer to :ref:`types`.
110+
See the documentation for :func:`sys.settrace` for more information on the
111+
trace function. For more information on code and frame objects, refer to
112+
:ref:`types`.
112113

113114
.. method:: dispatch_line(frame)
114115

‎Doc/library/collections.rst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ ABC Inherits Abstract Methods Mixin
4848
:class:`Iterable`, and ``__len__`` ``index``, and ``count``
4949
:class:`Container`
5050

51-
:class:`MutableSequnce` :class:`Sequence` ``__getitem__`` Inherited Sequence methods and
51+
:class:`MutableSequence` :class:`Sequence` ``__getitem__`` Inherited Sequence methods and
5252
``__delitem__``, ``append``, ``reverse``, ``extend``, ``pop``,
5353
``insert``, ``remove``, and ``__iadd__``
5454
and ``__len__``
@@ -466,16 +466,16 @@ Named tuples assign meaning to each position in a tuple and allow for more reada
466466
self-documenting code. They can be used wherever regular tuples are used, and
467467
they add the ability to access fields by name instead of position index.
468468

469-
.. function:: namedtuple(typename, fieldnames, [verbose])
469+
.. function:: namedtuple(typename, field_names, [verbose])
470470

471471
Returns a new tuple subclass named *typename*. The new subclass is used to
472472
create tuple-like objects that have fields accessible by attribute lookup as
473473
well as being indexable and iterable. Instances of the subclass also have a
474-
helpful docstring (with typename and fieldnames) and a helpful :meth:`__repr__`
474+
helpful docstring (with typename and field_names) and a helpful :meth:`__repr__`
475475
method which lists the tuple contents in a ``name=value`` format.
476476

477-
The *fieldnames* are a single string with each fieldname separated by whitespace
478-
and/or commas, for example ``'x y'`` or ``'x, y'``. Alternatively, *fieldnames*
477+
The *field_names* are a single string with each fieldname separated by whitespace
478+
and/or commas, for example ``'x y'`` or ``'x, y'``. Alternatively, *field_names*
479479
can be a sequence of strings such as ``['x', 'y']``.
480480

481481
Any valid Python identifier may be used for a fieldname except for names

0 commit comments

Comments
 (0)