[Python-checkins] r72935 - in python/branches/release26-maint: Doc/howto/functional.rst Doc/howto/regex.rst Doc/library/decimal.rst Doc/library/socket.rst Doc/library/xmlrpclib.rst Doc/reference/lexical_analysis.rst

Tue May 26 10:50:50 CEST 2009

Author: georg.brandl
Date: Tue May 26 10:50:50 2009
New Revision: 72935
Log:
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.
........
Modified:
 python/branches/release26-maint/ (props changed)
 python/branches/release26-maint/Doc/howto/functional.rst
 python/branches/release26-maint/Doc/howto/regex.rst
 python/branches/release26-maint/Doc/library/decimal.rst
 python/branches/release26-maint/Doc/library/socket.rst
 python/branches/release26-maint/Doc/library/xmlrpclib.rst
 python/branches/release26-maint/Doc/reference/lexical_analysis.rst
Modified: python/branches/release26-maint/Doc/howto/functional.rst
==============================================================================

--- python/branches/release26-maint/Doc/howto/functional.rst	(original)
+++ python/branches/release26-maint/Doc/howto/functional.rst	Tue May 26 10:50:50 2009
@@ -472,7 +472,7 @@
 
 >>> gen = generate_ints(3)
 >>> gen
- <generator object at ...>
+ <generator object generate_ints at ...>
 >>> gen.next()
 0
 >>> gen.next()
Modified: python/branches/release26-maint/Doc/howto/regex.rst
==============================================================================
--- python/branches/release26-maint/Doc/howto/regex.rst	(original)
+++ python/branches/release26-maint/Doc/howto/regex.rst	Tue May 26 10:50:50 2009
@@ -264,7 +264,7 @@
 >>> 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
Modified: python/branches/release26-maint/Doc/library/decimal.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/decimal.rst	(original)
+++ python/branches/release26-maint/Doc/library/decimal.rst	Tue May 26 10:50:50 2009
@@ -1803,7 +1803,7 @@
 >>> 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?
Modified: python/branches/release26-maint/Doc/library/socket.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/socket.rst	(original)
+++ python/branches/release26-maint/Doc/library/socket.rst	Tue May 26 10:50:50 2009
@@ -405,7 +405,7 @@
 :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 @@
 
 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 @@
 
 Availability: Unix (maybe not all platforms).
 
+ .. seealso::
+
+ :func:`ipaddr.BaseIP.packed`
+ Platform-independent conversion to a packed, binary format.
+
 .. versionadded:: 2.3
 
 
Modified: python/branches/release26-maint/Doc/library/xmlrpclib.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/xmlrpclib.rst	(original)
+++ python/branches/release26-maint/Doc/library/xmlrpclib.rst	Tue May 26 10:50:50 2009
@@ -160,7 +160,7 @@
 .. 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 @@
 
 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)
Modified: python/branches/release26-maint/Doc/reference/lexical_analysis.rst
==============================================================================
--- python/branches/release26-maint/Doc/reference/lexical_analysis.rst	(original)
+++ python/branches/release26-maint/Doc/reference/lexical_analysis.rst	Tue May 26 10:50:50 2009
@@ -339,7 +339,9 @@
 
 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
