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

Skip to content

Commit c5605df

Browse files
birkenfeldbirkenfeld
committed
Merged revisions 73941-73943,74076,74094,74186,74211-74214,74247,74254,74262,74311,74334,74368 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ................ r73941 | georg.brandl | 2009-07-11 12:39:00 +0200 (Sa, 11 Jul 2009) | 9 lines Merged revisions 73940 via svnmerge from svn+ssh://[email protected]/python/trunk ........ r73940 | georg.brandl | 2009-07-11 12:37:38 +0200 (Sa, 11 Jul 2009) | 1 line #6430: add note about size of "u" type. ........ ................ r73942 | georg.brandl | 2009-07-11 12:39:23 +0200 (Sa, 11 Jul 2009) | 1 line #6430: remove mention of "w" array typecode. ................ r73943 | georg.brandl | 2009-07-11 12:43:08 +0200 (Sa, 11 Jul 2009) | 1 line #6421: The self argument of module-level PyCFunctions is now a reference to the module object. ................ r74076 | georg.brandl | 2009-07-18 11:07:48 +0200 (Sa, 18 Jul 2009) | 1 line #6502: add missing comma in docstring. ................ r74094 | georg.brandl | 2009-07-19 09:25:56 +0200 (So, 19 Jul 2009) | 10 lines Recorded merge of revisions 74089 via svnmerge from svn+ssh://[email protected]/python/trunk ........ r74089 | senthil.kumaran | 2009-07-19 04:43:43 +0200 (So, 19 Jul 2009) | 3 lines Fix for issue5102, timeout value propages between redirects, proxy, digest and auth handlers. Fixed tests to reflect the same. ........ ................ r74186 | georg.brandl | 2009-07-23 11:19:09 +0200 (Do, 23 Jul 2009) | 9 lines Recorded merge of revisions 74185 via svnmerge from svn+ssh://[email protected]/python/trunk ........ r74185 | georg.brandl | 2009-07-23 11:17:09 +0200 (Do, 23 Jul 2009) | 1 line Fix the "pylocals" gdb command. ........ ................ r74211 | georg.brandl | 2009-07-26 16:48:09 +0200 (So, 26 Jul 2009) | 9 lines Recorded merge of revisions 74210 via svnmerge from svn+ssh://[email protected]/python/trunk ........ r74210 | georg.brandl | 2009-07-26 16:44:23 +0200 (So, 26 Jul 2009) | 1 line Move member descriptions inside the classes. ........ ................ r74212 | georg.brandl | 2009-07-26 16:54:51 +0200 (So, 26 Jul 2009) | 9 lines Merged revisions 74209 via svnmerge from svn+ssh://[email protected]/python/trunk ........ r74209 | georg.brandl | 2009-07-26 16:37:28 +0200 (So, 26 Jul 2009) | 1 line builtin -> built-in. ........ ................ r74213 | georg.brandl | 2009-07-26 17:02:41 +0200 (So, 26 Jul 2009) | 9 lines Merged revisions 74207 via svnmerge from svn+ssh://[email protected]/python/trunk ........ r74207 | georg.brandl | 2009-07-26 16:19:57 +0200 (So, 26 Jul 2009) | 1 line #6577: fix (hopefully) all links to builtin instead of module/class-specific objects. ........ ................ r74214 | georg.brandl | 2009-07-26 17:03:49 +0200 (So, 26 Jul 2009) | 9 lines Merged revisions 74205 via svnmerge from svn+ssh://[email protected]/python/trunk ........ r74205 | georg.brandl | 2009-07-26 15:36:39 +0200 (So, 26 Jul 2009) | 1 line #6576: fix cross-refs in re docs. ........ ................ r74247 | georg.brandl | 2009-07-29 09:27:08 +0200 (Mi, 29 Jul 2009) | 9 lines Merged revisions 74239 via svnmerge from svn+ssh://[email protected]/python/trunk ........ r74239 | georg.brandl | 2009-07-28 18:55:32 +0000 (Di, 28 Jul 2009) | 1 line Clarify quote_plus() usage. ........ ................ r74254 | georg.brandl | 2009-07-29 18:14:16 +0200 (Mi, 29 Jul 2009) | 1 line #6586: fix return/argument type doc for os.read() and os.write(). ................ r74262 | alexandre.vassalotti | 2009-07-29 21:54:39 +0200 (Mi, 29 Jul 2009) | 57 lines Merged revisions 74074,74077,74111,74188,74192-74193,74200,74252-74253,74258-74261 via svnmerge from svn+ssh://[email protected]/python/trunk ........ r74074 | georg.brandl | 2009-07-18 05:03:10 -0400 (Sat, 18 Jul 2009) | 1 line #6513: fix example code: warning categories are classes, not instances. ........ r74077 | georg.brandl | 2009-07-18 05:43:40 -0400 (Sat, 18 Jul 2009) | 1 line #6489: fix an ambiguity in getiterator() documentation. ........ r74111 | benjamin.peterson | 2009-07-20 09:30:10 -0400 (Mon, 20 Jul 2009) | 1 line remove docs for deprecated -p option ........ r74188 | benjamin.peterson | 2009-07-23 10:25:31 -0400 (Thu, 23 Jul 2009) | 1 line use bools ........ r74192 | georg.brandl | 2009-07-24 12:28:38 -0400 (Fri, 24 Jul 2009) | 1 line Fix arg types of et#. ........ r74193 | georg.brandl | 2009-07-24 12:46:38 -0400 (Fri, 24 Jul 2009) | 1 line Dont put "void" in signature for nullary functions. ........ r74200 | georg.brandl | 2009-07-25 09:02:15 -0400 (Sat, 25 Jul 2009) | 1 line #6571: add index entries for more operators. ........ r74252 | georg.brandl | 2009-07-29 12:06:31 -0400 (Wed, 29 Jul 2009) | 1 line #6593: fix link targets. ........ r74253 | georg.brandl | 2009-07-29 12:09:17 -0400 (Wed, 29 Jul 2009) | 1 line #6591: add reference to ioctl in fcntl module for platforms other than Windows. ........ r74258 | georg.brandl | 2009-07-29 12:57:05 -0400 (Wed, 29 Jul 2009) | 1 line Add a link to readline, and mention IPython and bpython. ........ r74259 | georg.brandl | 2009-07-29 13:07:21 -0400 (Wed, 29 Jul 2009) | 1 line Fix some markup and small factual glitches found by M. Markert. ........ r74260 | georg.brandl | 2009-07-29 13:15:20 -0400 (Wed, 29 Jul 2009) | 1 line Fix a few markup glitches. ........ r74261 | georg.brandl | 2009-07-29 13:50:25 -0400 (Wed, 29 Jul 2009) | 1 line Rewrite the section about classes a bit; mostly tidbits, and a larger update to the section about "private" variables to reflect the Pythonic consensus better. ........ ................ r74311 | georg.brandl | 2009-08-04 22:29:27 +0200 (Di, 04 Aug 2009) | 1 line Slightly improve buffer-related error message. ................ r74334 | georg.brandl | 2009-08-06 19:51:03 +0200 (Do, 06 Aug 2009) | 1 line #6648: mention surrogateescape handler where all standard handlers are listed. ................ r74368 | georg.brandl | 2009-08-13 09:56:35 +0200 (Do, 13 Aug 2009) | 21 lines Merged revisions 74328,74332-74333,74365 via svnmerge from svn+ssh://[email protected]/python/trunk ........ r74328 | georg.brandl | 2009-08-06 17:06:25 +0200 (Do, 06 Aug 2009) | 1 line Fix base keyword arg name for int() and long(). ........ r74332 | georg.brandl | 2009-08-06 19:23:21 +0200 (Do, 06 Aug 2009) | 1 line Fix punctuation and one copy-paste error. ........ r74333 | georg.brandl | 2009-08-06 19:43:55 +0200 (Do, 06 Aug 2009) | 1 line #6658: fix two typos. ........ r74365 | georg.brandl | 2009-08-13 09:48:05 +0200 (Do, 13 Aug 2009) | 1 line #6679: Remove mention that sub supports no flags. ........ ................
1 parent 0846055 commit c5605df

84 files changed

Lines changed: 534 additions & 533 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Doc/c-api/arg.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ variable(s) whose address should be passed.
160160
In both cases, *\*buffer_length* is set to the length of the encoded data
161161
without the trailing NUL byte.
162162

163-
``et#`` (string, Unicode object or character buffer compatible object) [const char \*encoding, char \*\*buffer]
163+
``et#`` (string, Unicode object or character buffer compatible object) [const char \*encoding, char \*\*buffer, int \*buffer_length]
164164
Same as ``es#`` except that string objects are passed through without recoding
165165
them. Instead, the implementation assumes that the string object uses the
166166
encoding passed in as parameter.

‎Doc/c-api/buffer.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ Buffer related functions
144144
kind of buffer the caller is prepared to deal with and therefore what
145145
kind of buffer the exporter is allowed to return. The buffer interface
146146
allows for complicated memory sharing possibilities, but some caller may
147-
not be able to handle all the complexibity but may want to see if the
147+
not be able to handle all the complexity but may want to see if the
148148
exporter will let them take a simpler view to its memory.
149149

150150
Some exporters may not be able to share memory in every possible way and

‎Doc/c-api/float.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,16 @@ Floating Point Objects
6464
around the header file :file:`float.h`.
6565

6666

67-
.. cfunction:: double PyFloat_GetMax(void)
67+
.. cfunction:: double PyFloat_GetMax()
6868

6969
Return the maximum representable finite float *DBL_MAX* as C :ctype:`double`.
7070

7171

72-
.. cfunction:: double PyFloat_GetMin(void)
72+
.. cfunction:: double PyFloat_GetMin()
7373

7474
Return the minimum normalized positive float *DBL_MIN* as C :ctype:`double`.
7575

76-
.. cfunction:: int PyFloat_ClearFreeList(void)
76+
.. cfunction:: int PyFloat_ClearFreeList()
7777

7878
Clear the float free list. Return the number of items that could not
7979
be freed.

‎Doc/c-api/import.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ Importing Modules
137137
*path*, possibly by fetching it from the :data:`sys.path_importer_cache`
138138
dict. If it wasn't yet cached, traverse :data:`sys.path_hooks` until a hook
139139
is found that can handle the path item. Return ``None`` if no hook could;
140-
this tells our caller it should fall back to the builtin import mechanism.
140+
this tells our caller it should fall back to the built-in import mechanism.
141141
Cache the result in :data:`sys.path_importer_cache`. Return a new reference
142142
to the importer object.
143143

‎Doc/c-api/method.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ no longer available.
9494
Macro version of :cfunc:`PyMethod_Self` which avoids error checking.
9595

9696

97-
.. cfunction:: int PyMethod_ClearFreeList(void)
97+
.. cfunction:: int PyMethod_ClearFreeList()
9898

9999
Clear the free list. Return the total number of freed items.
100100

‎Doc/c-api/structures.rst‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,10 @@ convention flags can be combined with a binding flag.
146146

147147
This is the typical calling convention, where the methods have the type
148148
:ctype:`PyCFunction`. The function expects two :ctype:`PyObject\*` values.
149-
The first one is the *self* object for methods; for module functions, it
150-
has the value given to :cfunc:`Py_InitModule4` (or *NULL* if
151-
:cfunc:`Py_InitModule` was used). The second parameter (often called
152-
*args*) is a tuple object representing all arguments. This parameter is
153-
typically processed using :cfunc:`PyArg_ParseTuple` or
154-
:cfunc:`PyArg_UnpackTuple`.
149+
The first one is the *self* object for methods; for module functions, it is
150+
the module object. The second parameter (often called *args*) is a tuple
151+
object representing all arguments. This parameter is typically processed
152+
using :cfunc:`PyArg_ParseTuple` or :cfunc:`PyArg_UnpackTuple`.
155153

156154

157155
.. data:: METH_KEYWORDS
@@ -167,9 +165,9 @@ convention flags can be combined with a binding flag.
167165

168166
Methods without parameters don't need to check whether arguments are given if
169167
they are listed with the :const:`METH_NOARGS` flag. They need to be of type
170-
:ctype:`PyCFunction`. When used with object methods, the first parameter is
171-
typically named ``self`` and will hold a reference to the object instance.
172-
In all cases the second parameter will be *NULL*.
168+
:ctype:`PyCFunction`. The first parameter is typically named *self* and will
169+
hold a reference to the module or object instance. In all cases the second
170+
parameter will be *NULL*.
173171

174172

175173
.. data:: METH_O

‎Doc/c-api/sys.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ accessible to C code. They all work with the current interpreter thread's
7373
case *name* is deleted from the sys module. Returns ``0`` on success, ``-1``
7474
on error.
7575

76-
.. cfunction:: void PySys_ResetWarnOptions(void)
76+
.. cfunction:: void PySys_ResetWarnOptions()
7777

7878
Reset :data:`sys.warnoptions` to an empty list.
7979

‎Doc/c-api/tuple.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,6 @@ Tuple Objects
107107
raises :exc:`MemoryError` or :exc:`SystemError`.
108108

109109

110-
.. cfunction:: int PyTuple_ClearFreeList(void)
110+
.. cfunction:: int PyTuple_ClearFreeList()
111111

112112
Clear the free list. Return the total number of freed items.

‎Doc/c-api/type.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Type Objects
3333
standard type object. Return false in all other cases.
3434

3535

36-
.. cfunction:: unsigned int PyType_ClearCache(void)
36+
.. cfunction:: unsigned int PyType_ClearCache()
3737

3838
Clear the internal lookup cache. Return the current version tag.
3939

‎Doc/c-api/unicode.rst‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,11 @@ access internal read-only data of Unicode objects:
8484
:ctype:`PyUnicodeObject` (not checked).
8585

8686

87-
.. cfunction:: int PyUnicode_ClearFreeList(void)
87+
.. cfunction:: int PyUnicode_ClearFreeList()
8888

8989
Clear the free list. Return the total number of freed items.
9090

91+
9192
Unicode provides many different character properties. The most often needed ones
9293
are available through these macros which are mapped to C functions depending on
9394
the Python configuration.
@@ -372,12 +373,12 @@ the system's :ctype:`wchar_t`.
372373
Built-in Codecs
373374
^^^^^^^^^^^^^^^
374375

375-
Python provides a set of builtin codecs which are written in C for speed. All of
376+
Python provides a set of built-in codecs which are written in C for speed. All of
376377
these codecs are directly usable via the following functions.
377378

378379
Many of the following APIs take two arguments encoding and errors. These
379380
parameters encoding and errors have the same semantics as the ones of the
380-
builtin unicode() Unicode object constructor.
381+
built-in :func:`unicode` Unicode object constructor.
381382

382383
Setting encoding to *NULL* causes the default encoding to be used
383384
which is ASCII. The file system calls should use
@@ -389,7 +390,7 @@ pointer to a static string, on others, it will change at run-time
389390

390391
Error handling is set by errors which may also be set to *NULL* meaning to use
391392
the default handling defined for the codec. Default error handling for all
392-
builtin codecs is "strict" (:exc:`ValueError` is raised).
393+
built-in codecs is "strict" (:exc:`ValueError` is raised).
393394

394395
The codecs all use a similar interface. Only deviation from the following
395396
generic ones are documented for simplicity.
@@ -403,7 +404,7 @@ These are the generic codec APIs:
403404

404405
Create a Unicode object by decoding *size* bytes of the encoded string *s*.
405406
*encoding* and *errors* have the same meaning as the parameters of the same name
406-
in the :func:`unicode` builtin function. The codec to be used is looked up
407+
in the :func:`unicode` built-in function. The codec to be used is looked up
407408
using the Python codec registry. Return *NULL* if an exception was raised by
408409
the codec.
409410

0 commit comments

Comments
 (0)