diff options
| -rw-r--r-- | Doc/howto/functional.rst | 2 | ||||
| -rw-r--r-- | Doc/howto/regex.rst | 2 | ||||
| -rw-r--r-- | Doc/library/decimal.rst | 2 | ||||
| -rw-r--r-- | Doc/library/socket.rst | 9 | ||||
| -rw-r--r-- | Doc/library/xmlrpclib.rst | 4 | ||||
| -rw-r--r-- | Doc/reference/lexical_analysis.rst | 4 |
6 files changed, 15 insertions, 8 deletions
diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst index d589f36..4f606d7 100644 --- 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 81d5aba..71ff56d 100644 --- 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 becac98..4a86913 100644 --- 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 4f2a32e..a435b820 100644 --- 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 4035f8e..647cda9 100644 --- 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 21449eb..e88c0ba 100644 --- 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 |