Author: georg.brandl Date: Fri Nov 26 10:05:43 2010 New Revision: 86789 Log: Merged revisions 86134,86315-86316,86390,86424-86425,86428,86550,86561-86562,86564-86565,86705,86708,86713 via svnmerge from svn+ssh://svn.python.org/python/branches/py3k ........ r86134 | georg.brandl | 2010-11-03 08:41:00 +0100 (Mi, 03 Nov 2010) | 1 line A newline in lineno output breaks pyframe output. ........ r86315 | georg.brandl | 2010-11-08 12:05:18 +0100 (Mo, 08 Nov 2010) | 1 line Fix latex conversion glitch in property/feature descriptions. ........ r86316 | georg.brandl | 2010-11-08 12:08:35 +0100 (Mo, 08 Nov 2010) | 1 line Fix typo. ........ r86390 | georg.brandl | 2010-11-10 08:57:10 +0100 (Mi, 10 Nov 2010) | 1 line Fix typo. ........ r86424 | georg.brandl | 2010-11-12 07:19:48 +0100 (Fr, 12 Nov 2010) | 1 line Build a PDF of the FAQs too. ........ r86425 | georg.brandl | 2010-11-12 07:20:12 +0100 (Fr, 12 Nov 2010) | 1 line #10008: Fix duplicate index entry. ........ r86428 | georg.brandl | 2010-11-12 09:09:26 +0100 (Fr, 12 Nov 2010) | 1 line Fix weird line block in table. ........ r86550 | georg.brandl | 2010-11-20 11:24:34 +0100 (Sa, 20 Nov 2010) | 1 line Fix rst markup errors. ........ r86561 | georg.brandl | 2010-11-20 12:47:10 +0100 (Sa, 20 Nov 2010) | 1 line #10460: Update indent.pro to match PEP 7 better. ........ r86562 | georg.brandl | 2010-11-20 14:44:41 +0100 (Sa, 20 Nov 2010) | 1 line #10439: document PyCodec C APIs. ........ r86564 | georg.brandl | 2010-11-20 15:08:53 +0100 (Sa, 20 Nov 2010) | 1 line #10460: an even better indent.pro. ........ r86565 | georg.brandl | 2010-11-20 15:16:17 +0100 (Sa, 20 Nov 2010) | 1 line socket.gethostbyname(socket.gethostname()) can fail when host name resolution is not set up correctly; do not fail test_socket if this is the case. ........ r86705 | georg.brandl | 2010-11-23 08:54:19 +0100 (Di, 23 Nov 2010) | 1 line #10468: document Unicode exception creation and access functions. ........ r86708 | georg.brandl | 2010-11-23 09:37:54 +0100 (Di, 23 Nov 2010) | 2 lines #10511: clarification of what heaps are; suggested by Johannes Hoff. ........ r86713 | georg.brandl | 2010-11-23 19:14:57 +0100 (Di, 23 Nov 2010) | 1 line assert.h is also included. Thanks to Savio Sena. ........ Added: python/branches/release31-maint/Doc/c-api/codec.rst - copied, changed from r86565, /python/branches/py3k/Doc/c-api/codec.rst Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Doc/c-api/exceptions.rst python/branches/release31-maint/Doc/c-api/intro.rst python/branches/release31-maint/Doc/c-api/utilities.rst python/branches/release31-maint/Doc/conf.py python/branches/release31-maint/Doc/library/heapq.rst python/branches/release31-maint/Doc/library/itertools.rst python/branches/release31-maint/Doc/library/xml.sax.handler.rst python/branches/release31-maint/Doc/library/zipfile.rst python/branches/release31-maint/Doc/tutorial/datastructures.rst python/branches/release31-maint/Include/codecs.h python/branches/release31-maint/Lib/test/test_socket.py python/branches/release31-maint/Misc/gdbinit python/branches/release31-maint/Misc/indent.pro Copied: python/branches/release31-maint/Doc/c-api/codec.rst (from r86565, /python/branches/py3k/Doc/c-api/codec.rst) ============================================================================== --- /python/branches/py3k/Doc/c-api/codec.rst (original) +++ python/branches/release31-maint/Doc/c-api/codec.rst Fri Nov 26 10:05:43 2010 @@ -3,19 +3,19 @@ Codec registry and support functions ==================================== -.. c:function:: int PyCodec_Register(PyObject *search_function) +.. cfunction:: int PyCodec_Register(PyObject *search_function) Register a new codec search function. As side effect, this tries to load the :mod:`encodings` package, if not yet done, to make sure that it is always first in the list of search functions. -.. c:function:: int PyCodec_KnownEncoding(const char *encoding) +.. cfunction:: int PyCodec_KnownEncoding(const char *encoding) Return ``1`` or ``0`` depending on whether there is a registered codec for the given *encoding*. -.. c:function:: PyObject* PyCodec_Encode(PyObject *object, const char *encoding, const char *errors) +.. cfunction:: PyObject* PyCodec_Encode(PyObject *object, const char *encoding, const char *errors) Generic codec based encoding API. @@ -24,7 +24,7 @@ be *NULL* to use the default method defined for the codec. Raises a :exc:`LookupError` if no encoder can be found. -.. c:function:: PyObject* PyCodec_Decode(PyObject *object, const char *encoding, const char *errors) +.. cfunction:: PyObject* PyCodec_Decode(PyObject *object, const char *encoding, const char *errors) Generic codec based decoding API. @@ -42,27 +42,27 @@ effectively case-insensitive. If no codec is found, a :exc:`KeyError` is set and *NULL* returned. -.. c:function:: PyObject* PyCodec_Encoder(const char *encoding) +.. cfunction:: PyObject* PyCodec_Encoder(const char *encoding) Get an encoder function for the given *encoding*. -.. c:function:: PyObject* PyCodec_Decoder(const char *encoding) +.. cfunction:: PyObject* PyCodec_Decoder(const char *encoding) Get a decoder function for the given *encoding*. -.. c:function:: PyObject* PyCodec_IncrementalEncoder(const char *encoding, const char *errors) +.. cfunction:: PyObject* PyCodec_IncrementalEncoder(const char *encoding, const char *errors) Get an :class:`IncrementalEncoder` object for the given *encoding*. -.. c:function:: PyObject* PyCodec_IncrementalDecoder(const char *encoding, const char *errors) +.. cfunction:: PyObject* PyCodec_IncrementalDecoder(const char *encoding, const char *errors) Get an :class:`IncrementalDecoder` object for the given *encoding*. -.. c:function:: PyObject* PyCodec_StreamReader(const char *encoding, PyObject *stream, const char *errors) +.. cfunction:: PyObject* PyCodec_StreamReader(const char *encoding, PyObject *stream, const char *errors) Get a :class:`StreamReader` factory function for the given *encoding*. -.. c:function:: PyObject* PyCodec_StreamWriter(const char *encoding, PyObject *stream, const char *errors) +.. cfunction:: PyObject* PyCodec_StreamWriter(const char *encoding, PyObject *stream, const char *errors) Get a :class:`StreamWriter` factory function for the given *encoding*. @@ -70,7 +70,7 @@ Registry API for Unicode encoding error handlers ------------------------------------------------ -.. c:function:: int PyCodec_RegisterError(const char *name, PyObject *error) +.. cfunction:: int PyCodec_RegisterError(const char *name, PyObject *error) Register the error handling callback function *error* under the given *name*. This callback function will be called by a codec when it encounters @@ -80,40 +80,38 @@ The callback gets a single argument, an instance of :exc:`UnicodeEncodeError`, :exc:`UnicodeDecodeError` or :exc:`UnicodeTranslateError` that holds information about the problematic - sequence of characters or bytes and their offset in the original string. The + sequence of characters or bytes and their offset in the original string (see + :ref:`unicodeexceptions` for functions to extract this information). The callback must either raise the given exception, or return a two-item tuple containing the replacement for the problematic sequence, and an integer giving the offset in the original string at which encoding/decoding should be resumed. - .. XXX once they are documented, link to PyUnicode*Error access functions - to show how to get at the exception properties - Return ``0`` on success, ``-1`` on error. -.. c:function:: PyObject* PyCodec_LookupError(const char *name) +.. cfunction:: PyObject* PyCodec_LookupError(const char *name) Lookup the error handling callback function registered under *name*. As a special case *NULL* can be passed, in which case the error handling callback for "strict" will be returned. -.. c:function:: PyObject* PyCodec_StrictErrors(PyObject *exc) +.. cfunction:: PyObject* PyCodec_StrictErrors(PyObject *exc) Raise *exc* as an exception. -.. c:function:: PyObject* PyCodec_IgnoreErrors(PyObject *exc) +.. cfunction:: PyObject* PyCodec_IgnoreErrors(PyObject *exc) Ignore the unicode error, skipping the faulty input. -.. c:function:: PyObject* PyCodec_ReplaceErrors(PyObject *exc) +.. cfunction:: PyObject* PyCodec_ReplaceErrors(PyObject *exc) Replace the unicode encode error with ``?`` or ``U+FFFD``. -.. c:function:: PyObject* PyCodec_XMLCharRefReplaceErrors(PyObject *exc) +.. cfunction:: PyObject* PyCodec_XMLCharRefReplaceErrors(PyObject *exc) Replace the unicode encode error with XML character references. -.. c:function:: PyObject* PyCodec_BackslashReplaceErrors(PyObject *exc) +.. cfunction:: PyObject* PyCodec_BackslashReplaceErrors(PyObject *exc) Replace the unicode encode error with backslash escapes (``\x``, ``\u`` and ``\U``). Modified: python/branches/release31-maint/Doc/c-api/exceptions.rst ============================================================================== --- python/branches/release31-maint/Doc/c-api/exceptions.rst (original) +++ python/branches/release31-maint/Doc/c-api/exceptions.rst Fri Nov 26 10:05:43 2010 @@ -446,6 +446,83 @@ This steals a reference to *ctx*. +.. _unicodeexceptions: + +Unicode Exception Objects +========================= + +The following functions are used to create and modify Unicode exceptions from C. + +.. cfunction:: PyObject* PyUnicodeDecodeError_Create(const char *encoding, const char *object, Py_ssize_t length, Py_ssize_t start, Py_ssize_t end, const char *reason) + + Create a :class:`UnicodeDecodeError` object with the attributes *encoding*, + *object*, *length*, *start*, *end* and *reason*. + +.. cfunction:: PyObject* PyUnicodeEncodeError_Create(const char *encoding, const Py_UNICODE *object, Py_ssize_t length, Py_ssize_t start, Py_ssize_t end, const char *reason) + + Create a :class:`UnicodeEncodeError` object with the attributes *encoding*, + *object*, *length*, *start*, *end* and *reason*. + +.. cfunction:: PyObject* PyUnicodeTranslateError_Create(const Py_UNICODE *object, Py_ssize_t length, Py_ssize_t start, Py_ssize_t end, const char *reason) + + Create a :class:`UnicodeTranslateError` object with the attributes *object*, + *length*, *start*, *end* and *reason*. + +.. cfunction:: PyObject* PyUnicodeDecodeError_GetEncoding(PyObject *exc) + PyObject* PyUnicodeEncodeError_GetEncoding(PyObject *exc) + + Return the *encoding* attribute of the given exception object. + +.. cfunction:: PyObject* PyUnicodeDecodeError_GetObject(PyObject *exc) + PyObject* PyUnicodeEncodeError_GetObject(PyObject *exc) + PyObject* PyUnicodeTranslateError_GetObject(PyObject *exc) + + Return the *object* attribute of the given exception object. + +.. cfunction:: int PyUnicodeDecodeError_GetStart(PyObject *exc, Py_ssize_t *start) + int PyUnicodeEncodeError_GetStart(PyObject *exc, Py_ssize_t *start) + int PyUnicodeTranslateError_GetStart(PyObject *exc, Py_ssize_t *start) + + Get the *start* attribute of the given exception object and place it into + *\*start*. *start* must not be *NULL*. Return ``0`` on success, ``-1`` on + failure. + +.. cfunction:: int PyUnicodeDecodeError_SetStart(PyObject *exc, Py_ssize_t start) + int PyUnicodeEncodeError_SetStart(PyObject *exc, Py_ssize_t start) + int PyUnicodeTranslateError_SetStart(PyObject *exc, Py_ssize_t start) + + Set the *start* attribute of the given exception object to *start*. Return + ``0`` on success, ``-1`` on failure. + +.. cfunction:: int PyUnicodeDecodeError_GetEnd(PyObject *exc, Py_ssize_t *end) + int PyUnicodeEncodeError_GetEnd(PyObject *exc, Py_ssize_t *end) + int PyUnicodeTranslateError_GetEnd(PyObject *exc, Py_ssize_t *end) + + Get the *end* attribute of the given exception object and place it into + *\*end*. *end* must not be *NULL*. Return ``0`` on success, ``-1`` on + failure. + +.. cfunction:: int PyUnicodeDecodeError_SetEnd(PyObject *exc, Py_ssize_t end) + int PyUnicodeEncodeError_SetEnd(PyObject *exc, Py_ssize_t end) + int PyUnicodeTranslateError_SetEnd(PyObject *exc, Py_ssize_t end) + + Set the *end* attribute of the given exception object to *end*. Return ``0`` + on success, ``-1`` on failure. + +.. cfunction:: PyObject* PyUnicodeDecodeError_GetReason(PyObject *exc) + PyObject* PyUnicodeEncodeError_GetReason(PyObject *exc) + PyObject* PyUnicodeTranslateError_GetReason(PyObject *exc) + + Return the *reason* attribute of the given exception object. + +.. cfunction:: int PyUnicodeDecodeError_SetReason(PyObject *exc, const char *reason) + int PyUnicodeEncodeError_SetReason(PyObject *exc, const char *reason) + int PyUnicodeTranslateError_SetReason(PyObject *exc, const char *reason) + + Set the *reason* attribute of the given exception object to *reason*. Return + ``0`` on success, ``-1`` on failure. + + Recursion Control ================= Modified: python/branches/release31-maint/Doc/c-api/intro.rst ============================================================================== --- python/branches/release31-maint/Doc/c-api/intro.rst (original) +++ python/branches/release31-maint/Doc/c-api/intro.rst Fri Nov 26 10:05:43 2010 @@ -41,8 +41,8 @@ #include "Python.h" This implies inclusion of the following standard headers: ``<stdio.h>``, -``<string.h>``, ``<errno.h>``, ``<limits.h>``, and ``<stdlib.h>`` (if -available). +``<string.h>``, ``<errno.h>``, ``<limits.h>``, ``<assert.h>`` and ``<stdlib.h>`` +(if available). .. note:: Modified: python/branches/release31-maint/Doc/c-api/utilities.rst ============================================================================== --- python/branches/release31-maint/Doc/c-api/utilities.rst (original) +++ python/branches/release31-maint/Doc/c-api/utilities.rst Fri Nov 26 10:05:43 2010 @@ -18,3 +18,4 @@ arg.rst conversion.rst reflection.rst + codec.rst Modified: python/branches/release31-maint/Doc/conf.py ============================================================================== --- python/branches/release31-maint/Doc/conf.py (original) +++ python/branches/release31-maint/Doc/conf.py Fri Nov 26 10:05:43 2010 @@ -129,6 +129,8 @@ 'Python Tutorial', _stdauthor, 'manual'), ('using/index', 'using.tex', 'Python Setup and Usage', _stdauthor, 'manual'), + ('faq/index', 'faq.tex', + 'Python Frequently Asked Questions', _stdauthor, 'manual'), ('whatsnew/' + version, 'whatsnew.tex', 'What\'s New in Python', 'A. M. Kuchling', 'howto'), ] Modified: python/branches/release31-maint/Doc/library/heapq.rst ============================================================================== --- python/branches/release31-maint/Doc/library/heapq.rst (original) +++ python/branches/release31-maint/Doc/library/heapq.rst Fri Nov 26 10:05:43 2010 @@ -11,11 +11,12 @@ This module provides an implementation of the heap queue algorithm, also known as the priority queue algorithm. -Heaps are arrays for which ``heap[k] <= heap[2*k+1]`` and ``heap[k] <= -heap[2*k+2]`` for all *k*, counting elements from zero. For the sake of -comparison, non-existing elements are considered to be infinite. The -interesting property of a heap is that ``heap[0]`` is always its smallest -element. +Heaps are binary trees for which every parent node has a value less than or +equal to any of its children. This implementation uses arrays for which +``heap[k] <= heap[2*k+1]`` and ``heap[k] <= heap[2*k+2]`` for all *k*, counting +elements from zero. For the sake of comparison, non-existing elements are +considered to be infinite. The interesting property of a heap is that its +smallest element is always the root, ``heap[0]``. The API below differs from textbook heap algorithms in two aspects: (a) We use zero-based indexing. This makes the relationship between the index for a node Modified: python/branches/release31-maint/Doc/library/itertools.rst ============================================================================== --- python/branches/release31-maint/Doc/library/itertools.rst (original) +++ python/branches/release31-maint/Doc/library/itertools.rst Fri Nov 26 10:05:43 2010 @@ -67,7 +67,6 @@ :func:`permutations` p[, r] r-length tuples, all possible orderings, no repeated elements :func:`combinations` p, r r-length tuples, in sorted order, no repeated elements :func:`combinations_with_replacement` p, r r-length tuples, in sorted order, with repeated elements -| ``product('ABCD', repeat=2)`` ``AA AB AC AD BA BB BC BD CA CB CC CD DA DB DC DD`` ``permutations('ABCD', 2)`` ``AB AC AD BA BC BD CA CB CD DA DB DC`` ``combinations('ABCD', 2)`` ``AB AC AD BC BD CD`` Modified: python/branches/release31-maint/Doc/library/xml.sax.handler.rst ============================================================================== --- python/branches/release31-maint/Doc/library/xml.sax.handler.rst (original) +++ python/branches/release31-maint/Doc/library/xml.sax.handler.rst Fri Nov 26 10:05:43 2010 @@ -49,52 +49,57 @@ .. data:: feature_namespaces - Value: ``"http://xml.org/sax/features/namespaces"`` --- true: Perform Namespace - processing. --- false: Optionally do not perform Namespace processing (implies - namespace-prefixes; default). --- access: (parsing) read-only; (not parsing) - read/write + | value: ``"http://xml.org/sax/features/namespaces"`` + | true: Perform Namespace processing. + | false: Optionally do not perform Namespace processing (implies + namespace-prefixes; default). + | access: (parsing) read-only; (not parsing) read/write .. data:: feature_namespace_prefixes - Value: ``"http://xml.org/sax/features/namespace-prefixes"`` --- true: Report - the original prefixed names and attributes used for Namespace - declarations. --- false: Do not report attributes used for Namespace - declarations, and optionally do not report original prefixed names - (default). --- access: (parsing) read-only; (not parsing) read/write + | value: ``"http://xml.org/sax/features/namespace-prefixes"`` + | true: Report the original prefixed names and attributes used for Namespace + declarations. + | false: Do not report attributes used for Namespace declarations, and + optionally do not report original prefixed names (default). + | access: (parsing) read-only; (not parsing) read/write .. data:: feature_string_interning - Value: ``"http://xml.org/sax/features/string-interning"`` --- true: All element - names, prefixes, attribute names, Namespace URIs, and local names are interned - using the built-in intern function. --- false: Names are not necessarily - interned, although they may be (default). --- access: (parsing) read-only; (not - parsing) read/write + | value: ``"http://xml.org/sax/features/string-interning"`` + | true: All element names, prefixes, attribute names, Namespace URIs, and + local names are interned using the built-in intern function. + | false: Names are not necessarily interned, although they may be (default). + | access: (parsing) read-only; (not parsing) read/write .. data:: feature_validation - Value: ``"http://xml.org/sax/features/validation"`` --- true: Report all - validation errors (implies external-general-entities and - external-parameter-entities). --- false: Do not report validation errors. --- - access: (parsing) read-only; (not parsing) read/write + | value: ``"http://xml.org/sax/features/validation"`` + | true: Report all validation errors (implies external-general-entities and + external-parameter-entities). + | false: Do not report validation errors. + | access: (parsing) read-only; (not parsing) read/write .. data:: feature_external_ges - Value: ``"http://xml.org/sax/features/external-general-entities"`` --- true: - Include all external general (text) entities. --- false: Do not include - external general entities. --- access: (parsing) read-only; (not parsing) - read/write + | value: ``"http://xml.org/sax/features/external-general-entities"`` + | true: Include all external general (text) entities. + | false: Do not include external general entities. + | access: (parsing) read-only; (not parsing) read/write .. data:: feature_external_pes - Value: ``"http://xml.org/sax/features/external-parameter-entities"`` --- true: - Include all external parameter entities, including the external DTD subset. --- - false: Do not include any external parameter entities, even the external DTD - subset. --- access: (parsing) read-only; (not parsing) read/write + | value: ``"http://xml.org/sax/features/external-parameter-entities"`` + | true: Include all external parameter entities, including the external DTD + subset. + | false: Do not include any external parameter entities, even the external + DTD subset. + | access: (parsing) read-only; (not parsing) read/write .. data:: all_features @@ -104,34 +109,38 @@ .. data:: property_lexical_handler - Value: ``"http://xml.org/sax/properties/lexical-handler"`` --- data type: - xml.sax.sax2lib.LexicalHandler (not supported in Python 2) --- description: An - optional extension handler for lexical events like comments. --- access: - read/write + | value: ``"http://xml.org/sax/properties/lexical-handler"`` + | data type: xml.sax.sax2lib.LexicalHandler (not supported in Python 2) + | description: An optional extension handler for lexical events like + comments. + | access: read/write .. data:: property_declaration_handler - Value: ``"http://xml.org/sax/properties/declaration-handler"`` --- data type: - xml.sax.sax2lib.DeclHandler (not supported in Python 2) --- description: An - optional extension handler for DTD-related events other than notations and - unparsed entities. --- access: read/write + | value: ``"http://xml.org/sax/properties/declaration-handler"`` + | data type: xml.sax.sax2lib.DeclHandler (not supported in Python 2) + | description: An optional extension handler for DTD-related events other + than notations and unparsed entities. + | access: read/write .. data:: property_dom_node - Value: ``"http://xml.org/sax/properties/dom-node"`` --- data type: - org.w3c.dom.Node (not supported in Python 2) --- description: When parsing, - the current DOM node being visited if this is a DOM iterator; when not parsing, - the root DOM node for iteration. --- access: (parsing) read-only; (not parsing) - read/write + | value: ``"http://xml.org/sax/properties/dom-node"`` + | data type: org.w3c.dom.Node (not supported in Python 2) + | description: When parsing, the current DOM node being visited if this is + a DOM iterator; when not parsing, the root DOM node for iteration. + | access: (parsing) read-only; (not parsing) read/write .. data:: property_xml_string - Value: ``"http://xml.org/sax/properties/xml-string"`` --- data type: String --- - description: The literal string of characters that was the source for the - current event. --- access: read-only + | value: ``"http://xml.org/sax/properties/xml-string"`` + | data type: String + | description: The literal string of characters that was the source for the + current event. + | access: read-only .. data:: all_properties Modified: python/branches/release31-maint/Doc/library/zipfile.rst ============================================================================== --- python/branches/release31-maint/Doc/library/zipfile.rst (original) +++ python/branches/release31-maint/Doc/library/zipfile.rst Fri Nov 26 10:05:43 2010 @@ -36,6 +36,7 @@ .. class:: ZipFile + :noindex: The class for reading and writing ZIP files. See section :ref:`zipfile-objects` for constructor details. Modified: python/branches/release31-maint/Doc/tutorial/datastructures.rst ============================================================================== --- python/branches/release31-maint/Doc/tutorial/datastructures.rst (original) +++ python/branches/release31-maint/Doc/tutorial/datastructures.rst Fri Nov 26 10:05:43 2010 @@ -379,7 +379,7 @@ >>> basket = {'apple', 'orange', 'apple', 'pear', 'orange', 'banana'} >>> print(basket) # show that duplicates have been removed - {'orange', 'bananna', 'pear', 'apple'} + {'orange', 'banana', 'pear', 'apple'} >>> 'orange' in basket # fast membership testing True >>> 'crabgrass' in basket Modified: python/branches/release31-maint/Include/codecs.h ============================================================================== --- python/branches/release31-maint/Include/codecs.h (original) +++ python/branches/release31-maint/Include/codecs.h Fri Nov 26 10:05:43 2010 @@ -144,7 +144,7 @@ /* Unicode encoding error handling callback registry API */ -/* Register the error handling callback function error under the name +/* Register the error handling callback function error under the given name. This function will be called by the codec when it encounters unencodable characters/undecodable bytes and doesn't know the callback name, when name is specified as the error parameter @@ -152,8 +152,8 @@ Return 0 on success, -1 on error */ PyAPI_FUNC(int) PyCodec_RegisterError(const char *name, PyObject *error); -/* Lookup the error handling callback function registered under the - name error. As a special case NULL can be passed, in which case +/* Lookup the error handling callback function registered under the given + name. As a special case NULL can be passed, in which case the error handling callback for "strict" will be returned. */ PyAPI_FUNC(PyObject *) PyCodec_LookupError(const char *name); @@ -163,7 +163,7 @@ /* ignore the unicode error, skipping the faulty input */ PyAPI_FUNC(PyObject *) PyCodec_IgnoreErrors(PyObject *exc); -/* replace the unicode error with ? or U+FFFD */ +/* replace the unicode encode error with ? or U+FFFD */ PyAPI_FUNC(PyObject *) PyCodec_ReplaceErrors(PyObject *exc); /* replace the unicode encode error with XML character references */ Modified: python/branches/release31-maint/Lib/test/test_socket.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_socket.py (original) +++ python/branches/release31-maint/Lib/test/test_socket.py Fri Nov 26 10:05:43 2010 @@ -522,7 +522,11 @@ # XXX(nnorwitz): http://tinyurl.com/os5jz seems to indicate # it reasonable to get the host's addr in addition to 0.0.0.0. # At least for eCos. This is required for the S/390 to pass. - my_ip_addr = socket.gethostbyname(socket.gethostname()) + try: + my_ip_addr = socket.gethostbyname(socket.gethostname()) + except socket.error: + # Probably name lookup wasn't set up right; skip this test + return self.assertTrue(name[0] in ("0.0.0.0", my_ip_addr), '%s invalid' % name[0]) self.assertEqual(name[1], port) Modified: python/branches/release31-maint/Misc/gdbinit ============================================================================== --- python/branches/release31-maint/Misc/gdbinit (original) +++ python/branches/release31-maint/Misc/gdbinit Fri Nov 26 10:05:43 2010 @@ -67,7 +67,7 @@ set $__p = $__p + 1 end end - printf "%d\n", $__li + printf "%d", $__li end # print the current frame - verbose Modified: python/branches/release31-maint/Misc/indent.pro ============================================================================== --- python/branches/release31-maint/Misc/indent.pro (original) +++ python/branches/release31-maint/Misc/indent.pro Fri Nov 26 10:05:43 2010 @@ -1,15 +1,24 @@ --sob --nbad --bap --br --nce --ncs --npcs --i8 --ip8 --c25 +--blank-lines-after-declarations +--blank-lines-after-procedures +--braces-after-func-def-line +--braces-on-if-line +--braces-on-struct-decl-line +--break-after-boolean-operator +--comment-indentation25 +--comment-line-length79 +--continue-at-parentheses +--dont-cuddle-do-while +--dont-cuddle-else +--indent-level4 +--line-length79 +--no-space-after-casts +--no-space-after-function-call-names +--no-space-after-parentheses +--no-tabs +--procnames-start-lines +--space-after-for +--space-after-if +--space-after-while +--swallow-optional-blank-lines +-T PyCFunction -T PyObject - - - -