Merged revisions 72085,72132,72159,72288,72290,72292 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72085 | georg.brandl | 2009-04-28 23:48:35 +0200 (Di, 28 Apr 2009) | 1 line

  Make the doctests in the docs pass, except for those in the turtle module.
........
  r72132 | georg.brandl | 2009-04-30 00:44:07 +0200 (Do, 30 Apr 2009) | 1 line

  #5878: fix repr of re object.
........
  r72159 | georg.brandl | 2009-05-01 10:51:37 +0200 (Fr, 01 Mai 2009) | 2 lines

  #5889: remove comma at the end of a list that some C compilers don't like.
........
  r72288 | georg.brandl | 2009-05-04 22:42:08 +0200 (Mo, 04 Mai 2009) | 1 line

  #5925: fix highlighting of keyword table.
........
  r72290 | georg.brandl | 2009-05-04 22:45:13 +0200 (Mo, 04 Mai 2009) | 1 line

  #5927, 5928: typos.
........
  r72292 | georg.brandl | 2009-05-04 22:49:17 +0200 (Mo, 04 Mai 2009) | 1 line

  #5916, 5917: small socket doc improvements.
........

diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst
index d589f36b31726011acd414dc5249b3ad176d64a9..4f606d77db1f6614e0f27830aa38af87c69f224a 100644 (file)
--- a/Doc/howto/functional.rst
+++ b/Doc/howto/functional.rst
@@ -472,7 +472,7 @@ Here's a sample usage of the ``generate_ints()`` generator:
 
     >>> gen = generate_ints(3)
     >>> gen
-    <generator object at ...>
+    <generator object generate_ints at ...>
     >>> gen.next()
     0
     >>> gen.next()

diff --git a/Doc/howto/regex.rst b/Doc/howto/regex.rst
index 81d5abaf58a813321f23066580d68d95ed51944e..71ff56d3f4119abfc3007f110fa45d232c9de711 100644 (file)
--- a/Doc/howto/regex.rst
+++ b/Doc/howto/regex.rst
@@ -264,7 +264,7 @@ performing string substitutions. ::
    >>> import re
    >>> p = re.compile('ab*')
    >>> print p
-   <re.RegexObject instance at 80b4150>
+   <_sre.SRE_Pattern object at 80b4150>
 
 :func:`re.compile` also accepts an optional *flags* argument, used to enable
 various special features and syntax variations.  We'll go over the available

diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst
index becac9823bcb4f256e001012795bf98f83429534..4a869135450c1740812b4420916e84dcfee48b8f 100644 (file)
--- a/Doc/library/decimal.rst
+++ b/Doc/library/decimal.rst
@@ -1803,7 +1803,7 @@ the :const:`Inexact` trap is set, it is also useful for validation:
    >>> Decimal('3.214').quantize(TWOPLACES, context=Context(traps=[Inexact]))
    Traceback (most recent call last):
       ...
-   Inexact
+   Inexact: None
 
 Q. Once I have valid two place inputs, how do I maintain that invariant
 throughout an application?

diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 4f2a32ecf0402ec4641d744bfe5d426447eba76f..a435b820125b02eddc4dfce7eb183511c51c5c2d 100644 (file)
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -405,7 +405,7 @@ The module :mod:`socket` exports the following constants and functions:
    :exc:`socket.error` will be raised. Note that exactly what is valid depends on
    the underlying C implementation of :cfunc:`inet_aton`.
 
-   :func:`inet_aton` does not support IPv6, and :func:`getnameinfo` should be used
+   :func:`inet_aton` does not support IPv6, and :func:`inet_pton` should be used
    instead for IPv4/v6 dual stack support.
 
 
@@ -419,7 +419,7 @@ The module :mod:`socket` exports the following constants and functions:
 
    If the string passed to this function is not exactly 4 bytes in length,
    :exc:`socket.error` will be raised. :func:`inet_ntoa` does not support IPv6, and
-   :func:`getnameinfo` should be used instead for IPv4/v6 dual stack support.
+   :func:`inet_ntop` should be used instead for IPv4/v6 dual stack support.
 
 
 .. function:: inet_pton(address_family, ip_string)
@@ -437,6 +437,11 @@ The module :mod:`socket` exports the following constants and functions:
 
    Availability: Unix (maybe not all platforms).
 
+   .. seealso::
+
+      :func:`ipaddr.BaseIP.packed`
+         Platform-independent conversion to a packed, binary format.
+
    .. versionadded:: 2.3
 
 

diff --git a/Doc/library/xmlrpclib.rst b/Doc/library/xmlrpclib.rst
index 4035f8eeba639709bfd78e431bf46d5d1a2e1f90..647cda9b9f08246d142afcf6266b38badd8f3a02 100644 (file)
--- a/Doc/library/xmlrpclib.rst
+++ b/Doc/library/xmlrpclib.rst
@@ -160,7 +160,7 @@ grouped under the reserved :attr:`system` member:
 .. method:: ServerProxy.system.methodSignature(name)
 
    This method takes one parameter, the name of a method implemented by the XML-RPC
-   server.It returns an array of possible signatures for this method. A signature
+   server. It returns an array of possible signatures for this method. A signature
    is an array of types. The first of these types is the return type of the method,
    the rest are parameters.
 
@@ -174,7 +174,7 @@ grouped under the reserved :attr:`system` member:
 
    If no signature is defined for the method, a non-array value is returned. In
    Python this means that the type of the returned  value will be something other
-   that list.
+   than list.
 
 
 .. method:: ServerProxy.system.methodHelp(name)

diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst
index 21449eb373279442aa4e16c15acb74d700e7b7c9..e88c0ba8335de99a1433b50e693a05a935171533 100644 (file)
--- a/Doc/reference/lexical_analysis.rst
+++ b/Doc/reference/lexical_analysis.rst
@@ -339,7 +339,9 @@ Keywords
 
 The following identifiers are used as reserved words, or *keywords* of the
 language, and cannot be used as ordinary identifiers.  They must be spelled
-exactly as written here::
+exactly as written here:
+
+.. sourcecode:: text
 
    and       del       from      not       while
    as        elif      global    or        with