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

Skip to content

Commit 89d996e

Browse files
Yhg1sYhg1s
committed
Merged revisions 57778-58052 via svnmerge from
svn+ssh://[email protected]/python/trunk ........ r57820 | georg.brandl | 2007-08-31 08:59:27 +0200 (Fri, 31 Aug 2007) | 2 lines Document new shorthand notation for index entries. ........ r57827 | georg.brandl | 2007-08-31 10:47:51 +0200 (Fri, 31 Aug 2007) | 2 lines Fix subitem markup. ........ r57833 | martin.v.loewis | 2007-08-31 12:01:07 +0200 (Fri, 31 Aug 2007) | 1 line Mark registry components as 64-bit on Win64. ........ r57854 | bill.janssen | 2007-08-31 21:02:23 +0200 (Fri, 31 Aug 2007) | 1 line deprecate use of FakeSocket ........ r57855 | bill.janssen | 2007-08-31 21:02:46 +0200 (Fri, 31 Aug 2007) | 1 line remove mentions of socket.ssl in comments ........ r57856 | bill.janssen | 2007-08-31 21:03:31 +0200 (Fri, 31 Aug 2007) | 1 line remove use of non-existent SSLFakeSocket in apparently untested code ........ r57859 | martin.v.loewis | 2007-09-01 08:36:03 +0200 (Sat, 01 Sep 2007) | 3 lines Bug #1737210: Change Manufacturer of Windows installer to PSF. Will backport to 2.5. ........ r57865 | georg.brandl | 2007-09-01 09:51:24 +0200 (Sat, 01 Sep 2007) | 2 lines Fix RST link (backport from Py3k). ........ r57876 | georg.brandl | 2007-09-01 17:49:49 +0200 (Sat, 01 Sep 2007) | 2 lines Document sets' ">" and "<" operations (backport from py3k). ........ r57878 | skip.montanaro | 2007-09-01 19:40:03 +0200 (Sat, 01 Sep 2007) | 4 lines Added a note and examples to explain that re.split does not split on an empty pattern match. (issue 852532). ........ r57879 | walter.doerwald | 2007-09-01 20:18:09 +0200 (Sat, 01 Sep 2007) | 2 lines Fix wrong function names. ........ r57880 | walter.doerwald | 2007-09-01 20:34:05 +0200 (Sat, 01 Sep 2007) | 2 lines Fix typo. ........ r57889 | andrew.kuchling | 2007-09-01 22:31:59 +0200 (Sat, 01 Sep 2007) | 1 line Markup fix ........ r57892 | andrew.kuchling | 2007-09-01 22:43:36 +0200 (Sat, 01 Sep 2007) | 1 line Add various items ........ r57895 | andrew.kuchling | 2007-09-01 23:17:58 +0200 (Sat, 01 Sep 2007) | 1 line Wording change ........ r57896 | andrew.kuchling | 2007-09-01 23:18:31 +0200 (Sat, 01 Sep 2007) | 1 line Add more items ........ r57904 | ronald.oussoren | 2007-09-02 11:46:07 +0200 (Sun, 02 Sep 2007) | 3 lines Macosx: this patch ensures that the value of MACOSX_DEPLOYMENT_TARGET used by the Makefile is also used at configure-time. ........ r57925 | georg.brandl | 2007-09-03 09:16:46 +0200 (Mon, 03 Sep 2007) | 2 lines Fix #883466: don't allow Unicode as arguments to quopri and uu codecs. ........ r57936 | matthias.klose | 2007-09-04 01:33:04 +0200 (Tue, 04 Sep 2007) | 2 lines - Added support for linking the bsddb module against BerkeleyDB 4.6.x. ........ r57954 | mark.summerfield | 2007-09-04 10:16:15 +0200 (Tue, 04 Sep 2007) | 3 lines Added cross-references plus a note about dict & list shallow copying. ........ r57958 | martin.v.loewis | 2007-09-04 11:51:57 +0200 (Tue, 04 Sep 2007) | 3 lines Document that we rely on the OS to release the crypto context. Fixes #1626801. ........ r57960 | martin.v.loewis | 2007-09-04 15:13:14 +0200 (Tue, 04 Sep 2007) | 3 lines Patch #1388440: Add set_completion_display_matches_hook and get_completion_type to readline. ........ r57961 | martin.v.loewis | 2007-09-04 16:19:28 +0200 (Tue, 04 Sep 2007) | 3 lines Patch #1031213: Decode source line in SyntaxErrors back to its original source encoding. Will backport to 2.5. ........ r57972 | matthias.klose | 2007-09-04 20:17:36 +0200 (Tue, 04 Sep 2007) | 3 lines - Makefile.pre.in(buildbottest): Run an optional script pybuildbot.identify to include some information about the build environment. ........ r57973 | matthias.klose | 2007-09-04 21:05:38 +0200 (Tue, 04 Sep 2007) | 2 lines - Makefile.pre.in(buildbottest): Remove whitespace at eol. ........ r57975 | matthias.klose | 2007-09-04 22:46:02 +0200 (Tue, 04 Sep 2007) | 2 lines - Fix libffi configure for hppa*-*-linux* | parisc*-*-linux*. ........ r57980 | bill.janssen | 2007-09-05 02:46:27 +0200 (Wed, 05 Sep 2007) | 1 line SSL certificate distinguished names should be represented by tuples ........ r57985 | martin.v.loewis | 2007-09-05 08:39:17 +0200 (Wed, 05 Sep 2007) | 3 lines Patch #1105: Explain that one needs to build the solution to get dependencies right. ........ r57987 | armin.rigo | 2007-09-05 09:51:21 +0200 (Wed, 05 Sep 2007) | 4 lines PyDict_GetItem() returns a borrowed reference. There are probably a number of places that are open to attacks such as the following one, in bltinmodule.c:min_max(). ........ r57991 | martin.v.loewis | 2007-09-05 13:47:34 +0200 (Wed, 05 Sep 2007) | 3 lines Patch #786737: Allow building in a tree of symlinks pointing to a readonly source. ........ r57993 | georg.brandl | 2007-09-05 15:36:44 +0200 (Wed, 05 Sep 2007) | 2 lines Backport from Py3k: Bug #1684991: explain lookup semantics for __special__ methods (new-style classes only). ........ r58004 | armin.rigo | 2007-09-06 10:30:51 +0200 (Thu, 06 Sep 2007) | 4 lines Patch #1733973 by peaker: ptrace_enter_call() assumes no exception is currently set. This assumption is broken when throwing into a generator. ........ r58006 | armin.rigo | 2007-09-06 11:30:38 +0200 (Thu, 06 Sep 2007) | 4 lines PyDict_GetItem() returns a borrowed reference. This attack is against ceval.c:IMPORT_NAME, which calls an object (__builtin__.__import__) without holding a reference to it. ........ r58013 | georg.brandl | 2007-09-06 16:49:56 +0200 (Thu, 06 Sep 2007) | 2 lines Backport from 3k: #1116: fix reference to old filename. ........ r58021 | thomas.heller | 2007-09-06 22:26:20 +0200 (Thu, 06 Sep 2007) | 1 line Fix typo: c_float represents to C float type. ........ r58022 | skip.montanaro | 2007-09-07 00:29:06 +0200 (Fri, 07 Sep 2007) | 3 lines If this is correct for py3k branch and it's already in the release25-maint branch, seems like it ought to be on the trunk as well. ........ r58023 | gregory.p.smith | 2007-09-07 00:59:59 +0200 (Fri, 07 Sep 2007) | 4 lines Apply the fix from Issue1112 to make this test more robust and keep windows happy. ........ r58031 | brett.cannon | 2007-09-07 05:17:50 +0200 (Fri, 07 Sep 2007) | 4 lines Make uuid1 and uuid4 tests conditional on whether ctypes can be imported; implementation of either function depends on ctypes but uuid as a whole does not. ........ r58032 | brett.cannon | 2007-09-07 06:18:30 +0200 (Fri, 07 Sep 2007) | 6 lines Fix a crasher where Python code managed to infinitely recurse in C code without ever going back out to Python code in PyObject_Call(). Required introducing a static RuntimeError instance so that normalizing an exception there is no reliance on a recursive call that would put the exception system over the recursion check itself. ........ r58034 | thomas.heller | 2007-09-07 08:32:17 +0200 (Fri, 07 Sep 2007) | 1 line Add a 'c_longdouble' type to the ctypes module. ........ r58035 | thomas.heller | 2007-09-07 11:30:40 +0200 (Fri, 07 Sep 2007) | 1 line Remove unneeded #include. ........ r58036 | thomas.heller | 2007-09-07 11:33:24 +0200 (Fri, 07 Sep 2007) | 6 lines Backport from py3k branch: Add a workaround for a strange bug on win64, when _ctypes is compiled with the SDK compiler. This should fix the failing Lib\ctypes\test\test_as_parameter.py test. ........ r58037 | georg.brandl | 2007-09-07 16:14:40 +0200 (Fri, 07 Sep 2007) | 2 lines Fix a wrong indentation for sublists. ........ r58043 | georg.brandl | 2007-09-07 22:10:49 +0200 (Fri, 07 Sep 2007) | 2 lines #1095: ln -f doesn't work portably, fix in Makefile. ........ r58049 | skip.montanaro | 2007-09-08 02:34:17 +0200 (Sat, 08 Sep 2007) | 1 line be explicit about the actual location of the missing file ........
1 parent 4a625c3 commit 89d996e

55 files changed

Lines changed: 661 additions & 127 deletions

Some content is hidden

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

‎Doc/documenting/markup.rst‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ consists of a type and a value, separated by a colon.
707707
For example::
708708

709709
.. index::
710-
single: execution!context
710+
single: execution; context
711711
module: __main__
712712
module: sys
713713
triple: module; search; path
@@ -720,8 +720,8 @@ The possible entry types are:
720720

721721
single
722722
Creates a single index entry. Can be made a subentry by separating the
723-
subentry text with a semicolon (this is also used below to describe what
724-
entries are created).
723+
subentry text with a semicolon (this notation is also used below to describe
724+
what entries are created).
725725
pair
726726
``pair: loop; statement`` is a shortcut that creates two index entries,
727727
namely ``loop; statement`` and ``statement; loop``.
@@ -733,6 +733,13 @@ module, keyword, operator, object, exception, statement, builtin
733733
These all create two index entries. For example, ``module: hashlib`` creates
734734
the entries ``module; hashlib`` and ``hashlib; module``.
735735

736+
For index directives containing only "single" entries, there is a shorthand
737+
notation::
738+
739+
.. index:: BNF, grammar, syntax, notation
740+
741+
This creates four index entries.
742+
736743

737744
Grammar production displays
738745
---------------------------

‎Doc/library/codecs.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,12 +186,12 @@ functions which use :func:`lookup` for the codec lookup:
186186
Implements the ``ignore`` error handling.
187187

188188

189-
.. function:: xmlcharrefreplace_errors_errors(exception)
189+
.. function:: xmlcharrefreplace_errors(exception)
190190

191191
Implements the ``xmlcharrefreplace`` error handling.
192192

193193

194-
.. function:: backslashreplace_errors_errors(exception)
194+
.. function:: backslashreplace_errors(exception)
195195

196196
Implements the ``backslashreplace`` error handling.
197197

@@ -833,7 +833,7 @@ Without external information it's impossible to reliably determine which
833833
encoding was used for encoding a Unicode string. Each charmap encoding can
834834
decode any random byte sequence. However that's not possible with UTF-8, as
835835
UTF-8 byte sequences have a structure that doesn't allow arbitrary byte
836-
sequence. To increase the reliability with which a UTF-8 encoding can be
836+
sequences. To increase the reliability with which a UTF-8 encoding can be
837837
detected, Microsoft invented a variant of UTF-8 (that Python 2.5 calls
838838
``"utf-8-sig"``) for its Notepad program: Before any of the Unicode characters
839839
is written to the file, a UTF-8 encoded BOM (which looks like this as a byte

‎Doc/library/copy.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ file, socket, window, array, or any similar types. It does "copy" functions and
5454
classes (shallow and deeply), by returning the original object unchanged; this
5555
is compatible with the way these are treated by the :mod:`pickle` module.
5656

57+
Shallow copies of dictionaries can be made using :meth:`dict.copy`, and
58+
of lists by assigning a slice of the entire list, for example,
59+
``copied_list = original_list[:]``.
60+
5761
.. index:: module: pickle
5862

5963
Classes can use the same interfaces to control copying that they use to control

‎Doc/library/ctypes.rst‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,8 @@ Fundamental data types
247247
+----------------------+--------------------------------+----------------------------+
248248
| :class:`c_double` | ``double`` | float |
249249
+----------------------+--------------------------------+----------------------------+
250+
| :class:`c_longdouble`| ``long double`` | float |
251+
+----------------------+--------------------------------+----------------------------+
250252
| :class:`c_char_p` | ``char *`` (NUL terminated) | string or ``None`` |
251253
+----------------------+--------------------------------+----------------------------+
252254
| :class:`c_wchar_p` | ``wchar_t *`` (NUL terminated) | unicode or ``None`` |
@@ -2065,9 +2067,16 @@ These are the fundamental ctypes data types:
20652067
initializer.
20662068

20672069

2070+
.. class:: c_longdouble
2071+
2072+
Represents the C long double datatype. The constructor accepts an
2073+
optional float initializer. On platforms where ``sizeof(long
2074+
double) == sizeof(double)`` it is an alias to :class:`c_double`.
2075+
2076+
20682077
.. class:: c_float
20692078

2070-
Represents the C double datatype. The constructor accepts an optional float
2079+
Represents the C float datatype. The constructor accepts an optional float
20712080
initializer.
20722081

20732082

‎Doc/library/mutex.rst‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88

99

1010
The :mod:`mutex` module defines a class that allows mutual-exclusion via
11-
acquiring and releasing locks. It does not require (or imply) threading or
12-
multi-tasking, though it could be useful for those purposes.
11+
acquiring and releasing locks. It does not require (or imply)
12+
:mod:`threading` or multi-tasking, though it could be useful for those
13+
purposes.
1314

1415
The :mod:`mutex` module defines the following class:
1516

‎Doc/library/queue.rst‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77

88

99
The :mod:`Queue` module implements a multi-producer, multi-consumer FIFO queue.
10-
It is especially useful in threads programming when information must be
10+
It is especially useful in threaded programming when information must be
1111
exchanged safely between multiple threads. The :class:`Queue` class in this
1212
module implements all the required locking semantics. It depends on the
13-
availability of thread support in Python.
13+
availability of thread support in Python; see the :mod:`threading`
14+
module.
1415

1516
The :mod:`Queue` module defines the following class and exception:
1617

‎Doc/library/re.rst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,13 @@ form.
546546
>>> re.split('\W+', 'Words, words, words.', 1)
547547
['Words', 'words, words.']
548548

549+
Note that *split* will never split a string on an empty pattern match.
550+
For example ::
551+
552+
>>> re.split('x*', 'foo')
553+
['foo']
554+
>>> re.split("(?m)^$", "foo\n\nbar\n")
555+
['foo\n\nbar\n']
549556

550557
.. function:: findall(pattern, string[, flags])
551558

‎Doc/library/readline.rst‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,12 @@ The :mod:`readline` module defines the following functions:
128128
Get the completer function, or ``None`` if no completer function has been set.
129129

130130

131+
.. function:: get_completion_type()
132+
133+
Get the type of completion being attempted.
134+
135+
.. versionadded:: 2.6
136+
131137
.. function:: get_begidx()
132138

133139
Get the beginning index of the readline tab-completion scope.
@@ -147,6 +153,16 @@ The :mod:`readline` module defines the following functions:
147153

148154
Get the readline word delimiters for tab-completion.
149155

156+
.. function:: set_completion_display_matches_hook([function])
157+
158+
Set or remove the completion display function. If *function* is
159+
specified, it will be used as the new completion display function;
160+
if omitted or ``None``, any completion display function already
161+
installed is removed. The completion display function is called as
162+
``function(substitution, [matches], longest_match_length)`` once
163+
each time matches need to be displayed.
164+
165+
.. versionadded:: 2.6
150166

151167
.. function:: add_history(line)
152168

‎Doc/library/smtplib.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Protocol) and :rfc:`1869` (SMTP Service Extensions).
4747
.. class:: LMTP([host[, port[, local_hostname]]])
4848

4949
The LMTP protocol, which is very similar to ESMTP, is heavily based on the
50-
standard SMTP client. It's common to use Unix sockets for LMTP, so our connect()
50+
standard SMTP client. It's common to use Unix sockets for LMTP, so our :meth:`connect`
5151
method must support that as well as a regular host:port server. To specify a
5252
Unix socket, you must use an absolute path for *host*, starting with a '/'.
5353

‎Doc/library/socket.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ The module :mod:`socket` exports the following constants and functions:
165165
.. function:: create_connection(address[, timeout])
166166

167167
Connects to the *address* received (as usual, a ``(host, port)`` pair), with an
168-
optional timeout for the connection. Specially useful for higher-level
168+
optional timeout for the connection. Especially useful for higher-level
169169
protocols, it is not normally used directly from application-level code.
170170
Passing the optional *timeout* parameter will set the timeout on the socket
171171
instance (if it is not given or ``None``, the global default timeout setting is

0 commit comments

Comments
 (0)