Skip to content

Commit ed03b41

Browse files
committed
Merge the trunk changes in. Breaks socket.ssl for now.
Merged revisions 57392-57619 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r57395 | georg.brandl | 2007-08-24 19:23:23 +0200 (Fri, 24 Aug 2007) | 2 lines Bug python#1011: fix rfc822.Message.getheader docs. ........ r57397 | georg.brandl | 2007-08-24 19:38:49 +0200 (Fri, 24 Aug 2007) | 2 lines Patch python#1006: port test_winreg to unittest. ........ r57398 | georg.brandl | 2007-08-24 19:46:54 +0200 (Fri, 24 Aug 2007) | 2 lines Fix python#1012: wrong URL to :mod:`site` in install/index.rst. ........ r57399 | georg.brandl | 2007-08-24 20:07:52 +0200 (Fri, 24 Aug 2007) | 2 lines Patch python#1008: port test_signal to unittest. ........ r57400 | georg.brandl | 2007-08-24 20:22:54 +0200 (Fri, 24 Aug 2007) | 2 lines Port test_frozen to unittest. ........ r57401 | georg.brandl | 2007-08-24 20:27:43 +0200 (Fri, 24 Aug 2007) | 2 lines Document new utility functions in test_support. ........ r57402 | georg.brandl | 2007-08-24 20:30:06 +0200 (Fri, 24 Aug 2007) | 2 lines Remove test_rgbimg output file, there is no test_rgbimg.py. ........ r57403 | georg.brandl | 2007-08-24 20:35:27 +0200 (Fri, 24 Aug 2007) | 2 lines Remove output file for test_ossaudiodev, also properly close the dsp object. ........ r57404 | georg.brandl | 2007-08-24 20:46:27 +0200 (Fri, 24 Aug 2007) | 2 lines Convert test_linuxaudiodev to unittest. Fix a wrong finally clause in test_ossaudiodev. ........ r57406 | collin.winter | 2007-08-24 21:13:58 +0200 (Fri, 24 Aug 2007) | 1 line Convert test_pkg to use unittest. ........ r57408 | georg.brandl | 2007-08-24 21:22:34 +0200 (Fri, 24 Aug 2007) | 2 lines Catch the correct errors. ........ r57409 | georg.brandl | 2007-08-24 21:33:53 +0200 (Fri, 24 Aug 2007) | 2 lines Port test_class to unittest. Patch #1671298. ........ r57415 | collin.winter | 2007-08-24 23:09:42 +0200 (Fri, 24 Aug 2007) | 1 line Make test_structmembers pass when run with regrtests's -R flag. ........ r57455 | nick.coghlan | 2007-08-25 06:32:07 +0200 (Sat, 25 Aug 2007) | 1 line Revert misguided attempt at fixing incompatibility between -m and -i switches (better fix coming soon) ........ r57456 | nick.coghlan | 2007-08-25 06:35:54 +0200 (Sat, 25 Aug 2007) | 1 line Revert compile.c changes that shouldn't have been included in previous checkin ........ r57461 | nick.coghlan | 2007-08-25 12:50:41 +0200 (Sat, 25 Aug 2007) | 1 line Fix bug 1764407 - the -i switch now does the right thing when using the -m switch ........ r57464 | guido.van.rossum | 2007-08-25 17:08:43 +0200 (Sat, 25 Aug 2007) | 4 lines Server-side SSL and certificate validation, by Bill Janssen. While cleaning up Bill's C style, I may have cleaned up some code he didn't touch as well (in _ssl.c). ........ r57465 | neal.norwitz | 2007-08-25 18:41:36 +0200 (Sat, 25 Aug 2007) | 3 lines Try to get this to build with Visual Studio by moving all the variable declarations to the beginning of a scope. ........ r57466 | neal.norwitz | 2007-08-25 18:54:38 +0200 (Sat, 25 Aug 2007) | 1 line Fix test so it is skipped properly if there is no SSL support. ........ r57467 | neal.norwitz | 2007-08-25 18:58:09 +0200 (Sat, 25 Aug 2007) | 2 lines Fix a few more variables to try to get this to compile with Visual Studio. ........ r57473 | neal.norwitz | 2007-08-25 19:25:17 +0200 (Sat, 25 Aug 2007) | 1 line Try to get this test to pass for systems that do not have SO_REUSEPORT ........ r57482 | gregory.p.smith | 2007-08-26 02:26:00 +0200 (Sun, 26 Aug 2007) | 7 lines keep setup.py from listing unneeded hash modules (_md5, _sha*) as missing when they were not built because _hashlib with openssl provided their functionality instead. don't build bsddb185 if bsddb was built. ........ r57483 | neal.norwitz | 2007-08-26 03:08:16 +0200 (Sun, 26 Aug 2007) | 1 line Fix typo in docstring (missing c in reacquire) ........ r57484 | neal.norwitz | 2007-08-26 03:42:03 +0200 (Sun, 26 Aug 2007) | 2 lines Spell check (also americanify behaviour, it's almost 3 times as common) ........ r57503 | neal.norwitz | 2007-08-26 08:29:57 +0200 (Sun, 26 Aug 2007) | 4 lines Reap children before the test starts so hopefully SocketServer won't find any old children left around which causes an exception in collect_children() and the test to fail. ........ r57510 | neal.norwitz | 2007-08-26 20:50:39 +0200 (Sun, 26 Aug 2007) | 1 line Fail gracefully if the cert files cannot be created ........ r57513 | guido.van.rossum | 2007-08-26 21:35:09 +0200 (Sun, 26 Aug 2007) | 4 lines Bill Janssen wrote: Here's a patch which makes test_ssl a better player in the buildbots environment. I deep-ended on "try-except-else" clauses. ........ r57518 | neal.norwitz | 2007-08-26 23:40:16 +0200 (Sun, 26 Aug 2007) | 1 line Get the test passing by commenting out some writes (should they be removed?) ........ r57522 | neal.norwitz | 2007-08-27 00:16:23 +0200 (Mon, 27 Aug 2007) | 3 lines Catch IOError for when the device file doesn't exist or the user doesn't have permission to write to the device. ........ r57524 | neal.norwitz | 2007-08-27 00:20:03 +0200 (Mon, 27 Aug 2007) | 5 lines Another patch from Bill Janssen that: 1) Fixes the bug that two class names are initial-lower-case. 2) Replaces the poll waiting for the server to become ready with a threading.Event signal. ........ r57536 | neal.norwitz | 2007-08-27 02:58:33 +0200 (Mon, 27 Aug 2007) | 1 line Stop using string.join (from the module) to ease upgrade to py3k ........ r57537 | neal.norwitz | 2007-08-27 03:03:18 +0200 (Mon, 27 Aug 2007) | 1 line Make a utility function for handling (printing) an error ........ r57538 | neal.norwitz | 2007-08-27 03:15:33 +0200 (Mon, 27 Aug 2007) | 4 lines If we can't create a certificate, print a warning, but don't fail the test. Modified patch from what Bill Janssen sent on python-3000. ........ r57539 | facundo.batista | 2007-08-27 03:15:34 +0200 (Mon, 27 Aug 2007) | 7 lines Ignore test failures caused by 'resource temporarily unavailable' exceptions raised in the test server thread, since SimpleXMLRPCServer does not gracefully handle them. Changed number of requests handled by tests server thread to one (was 2) because no tests require more than one request. [GSoC - Alan McIntyre] ........ r57561 | guido.van.rossum | 2007-08-27 19:19:42 +0200 (Mon, 27 Aug 2007) | 8 lines > Regardless, building a fixed test certificate and checking it in sounds like > the better option. Then the openssl command in the test code can be turned > into a comment describing how the test data was pregenerated. Here's a patch that does that. Bill ........ r57568 | guido.van.rossum | 2007-08-27 20:42:23 +0200 (Mon, 27 Aug 2007) | 26 lines > Some of the code sets the error string in this directly before > returning NULL, and other pieces of the code call PySSL_SetError, > which creates the error string. I think some of the places which set > the string directly probably shouldn't; instead, they should call > PySSL_SetError to cons up the error name directly from the err code. > However, PySSL_SetError only works after the construction of an ssl > object, which means it can't be used there... I'll take a longer look > at it and see if there's a reasonable fix. Here's a patch which addresses this. It also fixes the indentation in PySSL_SetError, bringing it into line with PEP 7, fixes a compile warning about one of the OpenSSL macros, and makes the namespace a bit more consistent. I've tested it on FC 7 and OS X 10.4. % ./python ./Lib/test/regrtest.py -R :1: -u all test_ssl test_ssl beginning 6 repetitions 123456 ...... 1 test OK. [29244 refs] % [GvR: slightly edited to enforce 79-char line length, even if it required violating the style guide.] ........ r57570 | guido.van.rossum | 2007-08-27 21:11:11 +0200 (Mon, 27 Aug 2007) | 2 lines Patch 10124 by Bill Janssen, docs for the new ssl code. ........ r57574 | guido.van.rossum | 2007-08-27 22:51:00 +0200 (Mon, 27 Aug 2007) | 3 lines Patch # 1739906 by Christian Heimes -- add reduce to functools (importing it from __builtin__). ........ r57575 | guido.van.rossum | 2007-08-27 22:52:10 +0200 (Mon, 27 Aug 2007) | 2 lines News about functools.reduce. ........ r57611 | georg.brandl | 2007-08-28 10:29:08 +0200 (Tue, 28 Aug 2007) | 2 lines Document rev. 57574. ........ r57612 | sean.reifschneider | 2007-08-28 11:07:54 +0200 (Tue, 28 Aug 2007) | 2 lines Adding basic imputil documentation. ........ r57614 | georg.brandl | 2007-08-28 12:48:18 +0200 (Tue, 28 Aug 2007) | 2 lines Fix some glitches. ........ r57616 | lars.gustaebel | 2007-08-28 14:31:09 +0200 (Tue, 28 Aug 2007) | 5 lines TarFile.__init__() no longer fails if no name argument is passed and the fileobj argument has no usable name attribute (e.g. StringIO). (will backport to 2.5) ........ r57619 | thomas.wouters | 2007-08-28 17:28:19 +0200 (Tue, 28 Aug 2007) | 22 lines Improve extended slicing support in builtin types and classes. Specifically: - Specialcase extended slices that amount to a shallow copy the same way as is done for simple slices, in the tuple, string and unicode case. - Specialcase step-1 extended slices to optimize the common case for all involved types. - For lists, allow extended slice assignment of differing lengths as long as the step is 1. (Previously, 'l[:2:1] = []' failed even though 'l[:2] = []' and 'l[:2:None] = []' do not.) - Implement extended slicing for buffer, array, structseq, mmap and UserString.UserString. - Implement slice-object support (but not non-step-1 slice assignment) for UserString.MutableString. - Add tests for all new functionality. ........
1 parent 9e7c8da commit ed03b41

Some content is hidden

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

56 files changed

+3640
-1199
lines changed

Doc/install/index.rst

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -604,8 +604,6 @@ value of ``sys.path``. ::
604604

605605
The null string in ``sys.path`` represents the current working directory.
606606

607-
.. % $ <-- bow to font-lock
608-
609607
The expected convention for locally installed packages is to put them in the
610608
:file:`{...}/site-packages/` directory, but you may want to install Python
611609
modules into some arbitrary directory. For example, your site may have a
@@ -624,9 +622,8 @@ installing fixed versions of standard modules.)
624622

625623
Paths can be absolute or relative, in which case they're relative to the
626624
directory containing the :file:`.pth` file. Any directories added to the search
627-
path will be scanned in turn for :file:`.pth` files. See `site module
628-
documentation <http://www.python.org/dev/doc/devel/lib/module-site.html>`_ for
629-
more information.
625+
path will be scanned in turn for :file:`.pth` files. See the documentation of
626+
the :mod:`site` module for more information.
630627

631628
A slightly less convenient way is to edit the :file:`site.py` file in Python's
632629
standard library, and modify ``sys.path``. :file:`site.py` is automatically

Doc/library/ctypes.rst

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ UNICODE is defined or not::
109109

110110
*windll* does not try to select one of them by magic, you must access the
111111
version you need by specifying ``GetModuleHandleA`` or ``GetModuleHandleW``
112-
explicitely, and then call it with normal strings or unicode strings
112+
explicitly, and then call it with normal strings or unicode strings
113113
respectively.
114114

115115
Sometimes, dlls export functions with names which aren't valid Python
@@ -383,7 +383,7 @@ course, it must be one of integer, string, or unicode::
383383

384384
If you don't want to store the instance's data in the :attr:`_as_parameter_`
385385
instance variable, you could define a ``property`` which makes the data
386-
avaiblable.
386+
available.
387387

388388

389389
.. _ctypes-specifying-required-argument-types:
@@ -600,7 +600,7 @@ Structure/union alignment and byte order
600600
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
601601

602602
By default, Structure and Union fields are aligned in the same way the C
603-
compiler does it. It is possible to override this behaviour be specifying a
603+
compiler does it. It is possible to override this behavior be specifying a
604604
:attr:`_pack_` class attribute in the subclass definition. This must be set to a
605605
positive integer and specifies the maximum alignment for the fields. This is
606606
what ``#pragma pack(n)`` also does in MSVC.
@@ -643,7 +643,7 @@ positive integer::
643643

644644
TenPointsArrayType = POINT * 10
645645

646-
Here is an example of an somewhat artifical data type, a structure containing 4
646+
Here is an example of an somewhat artificial data type, a structure containing 4
647647
POINTs among other stuff::
648648

649649
>>> from ctypes import *
@@ -1134,7 +1134,7 @@ hit the NULL entry::
11341134
>>>
11351135

11361136
The fact that standard Python has a frozen module and a frozen package
1137-
(indicated by the negative size member) is not wellknown, it is only used for
1137+
(indicated by the negative size member) is not well known, it is only used for
11381138
testing. Try it out with ``import __hello__`` for example.
11391139

11401140

@@ -1167,7 +1167,7 @@ Consider the following example::
11671167
>>>
11681168

11691169
Hm. We certainly expected the last statement to print ``3 4 1 2``. What
1170-
happended? Here are the steps of the ``rc.a, rc.b = rc.b, rc.a`` line above::
1170+
happened? Here are the steps of the ``rc.a, rc.b = rc.b, rc.a`` line above::
11711171

11721172
>>> temp0, temp1 = rc.b, rc.a
11731173
>>> rc.a = temp0
@@ -1180,8 +1180,8 @@ contents of ``temp0`` into ``rc`` 's buffer. This, in turn, changes the
11801180
contents of ``temp1``. So, the last assignment ``rc.b = temp1``, doesn't have
11811181
the expected effect.
11821182

1183-
Keep in mind that retrieving subobjects from Structure, Unions, and Arrays
1184-
doesn't *copy* the subobject, instead it retrieves a wrapper object accessing
1183+
Keep in mind that retrieving sub-objects from Structure, Unions, and Arrays
1184+
doesn't *copy* the sub-object, instead it retrieves a wrapper object accessing
11851185
the root-object's underlying buffer.
11861186

11871187
Another example that may behave different from what one would expect is this::
@@ -1292,11 +1292,11 @@ library to load.
12921292
is the form used for the posix linker option :option:`-l`). If no library can
12931293
be found, returns ``None``.
12941294

1295-
The exact functionality is system dependend.
1295+
The exact functionality is system dependent.
12961296

12971297
On Linux, ``find_library`` tries to run external programs (/sbin/ldconfig, gcc,
12981298
and objdump) to find the library file. It returns the filename of the library
1299-
file. Here are sone examples::
1299+
file. Here are some examples::
13001300

13011301
>>> from ctypes.util import find_library
13021302
>>> find_library("m")
@@ -1308,7 +1308,7 @@ file. Here are sone examples::
13081308
>>>
13091309

13101310
On OS X, ``find_library`` tries several predefined naming schemes and paths to
1311-
locate the library, and returns a full pathname if successfull::
1311+
locate the library, and returns a full pathname if successful::
13121312

13131313
>>> from ctypes.util import find_library
13141314
>>> find_library("c")
@@ -1367,7 +1367,7 @@ way is to instantiate one of the following classes:
13671367
platform.
13681368

13691369
The Python GIL is released before calling any function exported by these
1370-
libraries, and reaquired afterwards.
1370+
libraries, and reacquired afterwards.
13711371

13721372

13731373
.. class:: PyDLL(name, mode=DEFAULT_MODE, handle=None)
@@ -1411,7 +1411,7 @@ details, consult the ``dlopen(3)`` manpage, on Windows, *mode* is ignored.
14111411
*RTLD_GLOBAL*, otherwise it is the same as *RTLD_LOCAL*.
14121412

14131413
Instances of these classes have no public methods, however :meth:`__getattr__`
1414-
and :meth:`__getitem__` have special behaviour: functions exported by the shared
1414+
and :meth:`__getitem__` have special behavior: functions exported by the shared
14151415
library can be accessed as attributes of by index. Please note that both
14161416
:meth:`__getattr__` and :meth:`__getitem__` cache their result, so calling them
14171417
repeatedly returns the same object each time.
@@ -1427,7 +1427,7 @@ underscore to not clash with exported function names:
14271427

14281428
.. attribute:: PyDLL._name
14291429

1430-
The name of the library passed in the contructor.
1430+
The name of the library passed in the constructor.
14311431

14321432
Shared libraries can also be loaded by using one of the prefabricated objects,
14331433
which are instances of the :class:`LibraryLoader` class, either by calling the
@@ -1440,7 +1440,7 @@ loader instance.
14401440
Class which loads shared libraries. ``dlltype`` should be one of the
14411441
:class:`CDLL`, :class:`PyDLL`, :class:`WinDLL`, or :class:`OleDLL` types.
14421442

1443-
:meth:`__getattr__` has special behaviour: It allows to load a shared library by
1443+
:meth:`__getattr__` has special behavior: It allows to load a shared library by
14441444
accessing it as attribute of a library loader instance. The result is cached,
14451445
so repeated attribute accesses return the same library each time.
14461446

@@ -1508,7 +1508,7 @@ They are instances of a private class:
15081508
Instances of foreign functions are also C compatible data types; they represent
15091509
C function pointers.
15101510

1511-
This behaviour can be customized by assigning to special attributes of the
1511+
This behavior can be customized by assigning to special attributes of the
15121512
foreign function object.
15131513

15141514

@@ -1520,7 +1520,7 @@ foreign function object.
15201520
It is possible to assign a callable Python object that is not a ctypes type, in
15211521
this case the function is assumed to return a C ``int``, and the callable will
15221522
be called with this integer, allowing to do further processing or error
1523-
checking. Using this is deprecated, for more flexible postprocessing or error
1523+
checking. Using this is deprecated, for more flexible post processing or error
15241524
checking use a ctypes data type as :attr:`restype` and assign a callable to the
15251525
:attr:`errcheck` attribute.
15261526

@@ -1558,10 +1558,10 @@ foreign function object.
15581558
:attr:`restype` attribute.
15591559

15601560
``func`` is the foreign function object itself, this allows to reuse the same
1561-
callable object to check or postprocess the results of several functions.
1561+
callable object to check or post process the results of several functions.
15621562

15631563
``arguments`` is a tuple containing the parameters originally passed to the
1564-
function call, this allows to specialize the behaviour on the arguments used.
1564+
function call, this allows to specialize the behavior on the arguments used.
15651565

15661566
The object that this function returns will be returned from the foreign function
15671567
call, but it can also check the result value and raise an exception if the
@@ -1634,7 +1634,7 @@ different ways, depending on the type and number of the parameters in the call.
16341634
:noindex:
16351635

16361636
Returns a foreign function that will call a COM method. ``vtbl_index`` is the
1637-
index into the virtual function table, a small nonnegative integer. *name* is
1637+
index into the virtual function table, a small non-negative integer. *name* is
16381638
name of the COM method. *iid* is an optional pointer to the interface identifier
16391639
which is used in extended error reporting.
16401640

@@ -1827,14 +1827,14 @@ Utility functions
18271827

18281828
.. function:: DllCanUnloadNow()
18291829

1830-
Windows only: This function is a hook which allows to implement inprocess COM
1830+
Windows only: This function is a hook which allows to implement in-process COM
18311831
servers with ctypes. It is called from the DllCanUnloadNow function that the
18321832
_ctypes extension dll exports.
18331833

18341834

18351835
.. function:: DllGetClassObject()
18361836

1837-
Windows only: This function is a hook which allows to implement inprocess COM
1837+
Windows only: This function is a hook which allows to implement in-process COM
18381838
servers with ctypes. It is called from the DllGetClassObject function that the
18391839
``_ctypes`` extension dll exports.
18401840

@@ -1920,7 +1920,7 @@ Utility functions
19201920
Windows only: this function is probably the worst-named thing in ctypes. It
19211921
creates an instance of WindowsError. If *code* is not specified,
19221922
``GetLastError`` is called to determine the error code. If ``descr`` is not
1923-
spcified, :func:`FormatError` is called to get a textual description of the
1923+
specified, :func:`FormatError` is called to get a textual description of the
19241924
error.
19251925

19261926

@@ -1982,13 +1982,13 @@ Common instance variables of ctypes data types:
19821982

19831983
Sometimes ctypes data instances do not own the memory block they contain,
19841984
instead they share part of the memory block of a base object. The
1985-
:attr:`_b_base_` readonly member is the root ctypes object that owns the memory
1985+
:attr:`_b_base_` read-only member is the root ctypes object that owns the memory
19861986
block.
19871987

19881988

19891989
.. attribute:: _CData._b_needsfree_
19901990

1991-
This readonly variable is true when the ctypes data instance has allocated the
1991+
This read-only variable is true when the ctypes data instance has allocated the
19921992
memory block itself, false otherwise.
19931993

19941994

@@ -2033,7 +2033,7 @@ converted to native Python types. In other words, if a foreign function has a
20332033
:attr:`restype` of :class:`c_char_p`, you will always receive a Python string,
20342034
*not* a :class:`c_char_p` instance.
20352035

2036-
Subclasses of fundamental data types do *not* inherit this behaviour. So, if a
2036+
Subclasses of fundamental data types do *not* inherit this behavior. So, if a
20372037
foreign functions :attr:`restype` is a subclass of :class:`c_void_p`, you will
20382038
receive an instance of this subclass from the function call. Of course, you can
20392039
get the value of the pointer by accessing the ``value`` attribute.

Doc/library/functools.rst

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,15 @@ The :mod:`functools` module is for higher-order functions: functions that act on
1515
or return other functions. In general, any callable object can be treated as a
1616
function for the purposes of this module.
1717

18-
The :mod:`functools` module defines the following function:
18+
The :mod:`functools` module defines the following functions:
19+
20+
21+
.. function:: reduce(function, iterable[, initializer])
22+
23+
This is the same function as :func:`reduce`. It is made available in this module
24+
to allow writing code more forward-compatible with Python 3.
25+
26+
.. versionadded:: 2.6
1927

2028

2129
.. function:: partial(func[,*args][, **keywords])

0 commit comments

Comments
 (0)