Skip to content

Commit cda25a1

Browse files
birkenfeldbirkenfeld
committed
Merged revisions 74008,74021-74022,74074-74075,74077,74148,74179,74188,74192-74194,74200,74205 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r74008 | benjamin.peterson | 2009-07-15 02:46:42 +0200 (Mi, 15 Jul 2009) | 1 line update year ........ r74021 | georg.brandl | 2009-07-16 09:33:04 +0200 (Do, 16 Jul 2009) | 1 line python#6486: start with built in functions rather than "built in objects". ........ r74022 | georg.brandl | 2009-07-16 09:38:35 +0200 (Do, 16 Jul 2009) | 1 line python#6481: fix typo in os.system() replacement. ........ r74074 | georg.brandl | 2009-07-18 11:03:10 +0200 (Sa, 18 Jul 2009) | 1 line python#6513: fix example code: warning categories are classes, not instances. ........ r74075 | georg.brandl | 2009-07-18 11:06:31 +0200 (Sa, 18 Jul 2009) | 1 line python#6505: fix typos. ........ r74077 | georg.brandl | 2009-07-18 11:43:40 +0200 (Sa, 18 Jul 2009) | 1 line python#6489: fix an ambiguity in getiterator() documentation. ........ r74148 | ezio.melotti | 2009-07-21 22:18:27 +0200 (Di, 21 Jul 2009) | 1 line python#6536 fixed typo ........ r74179 | ezio.melotti | 2009-07-22 23:08:49 +0200 (Mi, 22 Jul 2009) | 1 line python#6423 has_key -> in ........ r74188 | benjamin.peterson | 2009-07-23 16:25:31 +0200 (Do, 23 Jul 2009) | 1 line use bools ........ r74192 | georg.brandl | 2009-07-24 18:28:38 +0200 (Fr, 24 Jul 2009) | 1 line Fix arg types of et#. ........ r74193 | georg.brandl | 2009-07-24 18:46:38 +0200 (Fr, 24 Jul 2009) | 1 line Dont put "void" in signature for nullary functions. ........ r74194 | georg.brandl | 2009-07-24 22:09:46 +0200 (Fr, 24 Jul 2009) | 1 line python#6564: fix section about the two raise syntaxes. ........ r74200 | georg.brandl | 2009-07-25 15:02:15 +0200 (Sa, 25 Jul 2009) | 1 line python#6571: add index entries for more operators. ........ r74205 | georg.brandl | 2009-07-26 15:36:39 +0200 (So, 26 Jul 2009) | 1 line python#6576: fix cross-refs in re docs. ........
1 parent 4ebc29e commit cda25a1

20 files changed

Lines changed: 99 additions & 83 deletions

‎Doc/c-api/arg.rst‎

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

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

‎Doc/c-api/float.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,21 +72,21 @@ Floating Point Objects
7272
.. versionadded:: 2.6
7373

7474

75-
.. cfunction:: double PyFloat_GetMax(void)
75+
.. cfunction:: double PyFloat_GetMax()
7676

7777
Return the maximum representable finite float *DBL_MAX* as C :ctype:`double`.
7878

7979
.. versionadded:: 2.6
8080

8181

82-
.. cfunction:: double PyFloat_GetMin(void)
82+
.. cfunction:: double PyFloat_GetMin()
8383

8484
Return the minimum normalized positive float *DBL_MIN* as C :ctype:`double`.
8585

8686
.. versionadded:: 2.6
8787

8888

89-
.. cfunction:: int PyFloat_ClearFreeList(void)
89+
.. cfunction:: int PyFloat_ClearFreeList()
9090

9191
Clear the float free list. Return the number of items that could not
9292
be freed.

‎Doc/c-api/int.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ Plain Integer Objects
131131
(:const:`LONG_MAX`, as defined in the system header files).
132132

133133

134-
.. cfunction:: int PyInt_ClearFreeList(void)
134+
.. cfunction:: int PyInt_ClearFreeList()
135135

136136
Clear the integer free list. Return the number of items that could not
137137
be freed.

‎Doc/c-api/method.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ There are some useful functions that are useful for working with method objects.
6565
Macro version of :cfunc:`PyMethod_Self` which avoids error checking.
6666

6767

68-
.. cfunction:: int PyMethod_ClearFreeList(void)
68+
.. cfunction:: int PyMethod_ClearFreeList()
6969

7070
Clear the free list. Return the total number of freed items.
7171

‎Doc/c-api/sys.rst‎

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

83-
.. cfunction:: void PySys_ResetWarnOptions(void)
83+
.. cfunction:: void PySys_ResetWarnOptions()
8484

8585
Reset :data:`sys.warnoptions` to an empty list.
8686

‎Doc/c-api/tuple.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ Tuple Objects
157157
require changes in your code for properly supporting 64-bit systems.
158158

159159

160-
.. cfunction:: int PyTuple_ClearFreeList(void)
160+
.. cfunction:: int PyTuple_ClearFreeList()
161161

162162
Clear the free list. Return the total number of freed items.
163163

‎Doc/c-api/type.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Type Objects
3535
.. versionadded:: 2.2
3636

3737

38-
.. cfunction:: unsigned int PyType_ClearCache(void)
38+
.. cfunction:: unsigned int PyType_ClearCache()
3939

4040
Clear the internal lookup cache. Return the current version tag.
4141

‎Doc/c-api/unicode.rst‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,13 @@ access internal read-only data of Unicode objects:
9898
:ctype:`PyUnicodeObject` (not checked).
9999

100100

101-
.. cfunction:: int PyUnicode_ClearFreeList(void)
101+
.. cfunction:: int PyUnicode_ClearFreeList()
102102

103103
Clear the free list. Return the total number of freed items.
104104

105105
.. versionadded:: 2.6
106106

107+
107108
Unicode provides many different character properties. The most often needed ones
108109
are available through these macros which are mapped to C functions depending on
109110
the Python configuration.

‎Doc/copyright.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Copyright
44

55
Python and this documentation is:
66

7-
Copyright © 2001-2008 Python Software Foundation. All rights reserved.
7+
Copyright © 2001-2009 Python Software Foundation. All rights reserved.
88

99
Copyright © 2000 BeOpen.com. All rights reserved.
1010

‎Doc/howto/urllib2.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ than the URL you pass to .add_password() will also match. ::
488488

489489
.. note::
490490

491-
In the above example we only supplied our ``HHTPBasicAuthHandler`` to
491+
In the above example we only supplied our ``HTTPBasicAuthHandler`` to
492492
``build_opener``. By default openers have the handlers for normal situations
493493
-- ``ProxyHandler``, ``UnknownHandler``, ``HTTPHandler``,
494494
``HTTPDefaultErrorHandler``, ``HTTPRedirectHandler``, ``FTPHandler``,

0 commit comments

Comments
 (0)