Merged revisions 68229 via svnmerge from

svn+ssh://svn.python.org/python/branches/py3k

........
  r68229 | georg.brandl | 2009-01-03 22:31:47 +0100 (Sat, 03 Jan 2009) | 2 lines

  Fix a few remaining problems found by rstlint.
........

diff --git a/Doc/extending/newtypes.rst b/Doc/extending/newtypes.rst
index 66af3bf36ae3d6637eccc30fd2e73426d6365694..3a9c44878aed6c0b1fa6722fff962298434d36e9 100644 (file)
--- a/Doc/extending/newtypes.rst
+++ b/Doc/extending/newtypes.rst
@@ -1216,7 +1216,7 @@ Here is an example::
 
        PyErr_Format(PyExc_AttributeError,
                     "'%.50s' object has no attribute '%.400s'",
-                   tp->tp_name, name);
+                    tp->tp_name, name);
        return NULL;
    }
 

diff --git a/Doc/howto/regex.rst b/Doc/howto/regex.rst
index d83665f27430c3f34cd23391d4fdd35fa3b52957..c2b16f2c5a40f5a8828c4196bb92e432adfa6458 100644 (file)
--- a/Doc/howto/regex.rst
+++ b/Doc/howto/regex.rst
@@ -611,7 +611,7 @@ of each one.
    is to read? ::
 
       charref = re.compile(r"""
-       &[#]                 # Start of a numeric entity reference
+       &[#]                # Start of a numeric entity reference
        (
            0[0-7]+         # Octal form
          | [0-9]+          # Decimal form

diff --git a/Doc/library/bdb.rst b/Doc/library/bdb.rst
index b1cf200b449249dacfd008850f34bd5a0e0272d7..9d75a01894e5f834ec86ef36eb21b0a2d5814db0 100644 (file)
--- a/Doc/library/bdb.rst
+++ b/Doc/library/bdb.rst
@@ -335,7 +335,7 @@ Finally, the module defines the following functions:
 
    Determine if there is an effective (active) breakpoint at this line of code.
    Return breakpoint number or 0 if none.
-       
+
    Called only if we know there is a breakpoint at this location.  Returns the
    breakpoint that was triggered and a flag that indicates if it is ok to delete
    a temporary breakpoint.

diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index 0b5f892a8846f5fa2a115f7835c5a77d5b0f811b..ec55a044601776898ea5042faddafb5d5fa0437e 100644 (file)
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -49,8 +49,8 @@ The :mod:`urllib.request` module defines the following functions:
    The urlopen function from the previous version, Python 2.6 and earlier,  of
    the module  urllib has been discontinued as urlopen can return the
    file-object as the previous. The proxy handling, which in earlier was passed
-   as a dict parameter to urlopen can be availed by the use of `ProxyHandler`
-   objects.
+   as a dict parameter to urlopen can be availed by the use of
+   :class:`ProxyHandler` objects.
 
 
 .. function:: install_opener(opener)

diff --git a/Doc/library/xmlrpc.client.rst b/Doc/library/xmlrpc.client.rst
index 23bb65007b83cdff9bb67c87aa11a2db524c9a74..9ee0277c06c33645a50279b660da3bb764ecbf62 100644 (file)
--- a/Doc/library/xmlrpc.client.rst
+++ b/Doc/library/xmlrpc.client.rst
@@ -513,8 +513,8 @@ transport.  The following example shows how:
            self.proxy = proxy
        def make_connection(self, host):
            self.realhost = host
-       h = http.client.HTTP(self.proxy)
-       return h
+           h = http.client.HTTP(self.proxy)
+           return h
        def send_request(self, connection, handler, request_body):
            connection.putrequest("POST", 'http://%s%s' % (self.realhost, handler))
        def send_host(self, connection, host):

diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst
index 826e6928b6192a5da7c4b07af112a3b91d5a66c6..5037da02726c4463f07842e7f812185ac03ef5d7 100644 (file)
--- a/Doc/reference/lexical_analysis.rst
+++ b/Doc/reference/lexical_analysis.rst
@@ -608,7 +608,7 @@ Some examples of integer literals::
 
    7     2147483647                        0o177    0b100110111
    3     79228162514264337593543950336     0o377    0x100000000
-         79228162514264337593543950336              0xdeadbeef                                         
+         79228162514264337593543950336              0xdeadbeef
 
 
 .. _floating:

diff --git a/Doc/reference/simple_stmts.rst b/Doc/reference/simple_stmts.rst
index 611435a2582ae683e171f295bbd96bb7cf0e6209..5793c09640973c6d2a9a9f90c740c8d568e14232 100644 (file)
--- a/Doc/reference/simple_stmts.rst
+++ b/Doc/reference/simple_stmts.rst
@@ -871,8 +871,8 @@ The :keyword:`nonlocal` statement
    nonlocal_stmt: "nonlocal" `identifier` ("," `identifier`)*
 
 .. XXX add when implemented
-                : ["=" (`target_list` "=")+ `expression_list`]
-                : | "nonlocal" `identifier` `augop` `expression_list`
+                : ["=" (`target_list` "=")+ expression_list]
+                : | "nonlocal" identifier augop expression_list
 
 The :keyword:`nonlocal` statement causes the listed identifiers to refer to
 previously bound variables in the nearest enclosing scope.  This is important

diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst
index d6842e09e2e64cd55c9df12951b47fe0aa7233cb..7d106fc3fc7ae1ce471fef9b80b614bee6e6d83e 100644 (file)
--- a/Doc/tutorial/classes.rst
+++ b/Doc/tutorial/classes.rst
@@ -789,7 +789,7 @@ easy to create::
    f
    l
    o
-   g   
+   g
 
 Anything that can be done with generators can also be done with class based
 iterators as described in the previous section.  What makes generators so

diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst
index 95497b42404fef359f7404f0a3d46c3ef699e3c8..98b246e9f5bf0dba43815ceaf2caed964c20ad3e 100644 (file)
--- a/Doc/tutorial/datastructures.rst
+++ b/Doc/tutorial/datastructures.rst
@@ -519,7 +519,7 @@ with the :func:`zip` function. ::
    >>> answers = ['lancelot', 'the holy grail', 'blue']
    >>> for q, a in zip(questions, answers):
    ...     print('What is your {0}?  It is {1}.'.format(q, a))
-   ... 
+   ...
    What is your name?  It is lancelot.
    What is your quest?  It is the holy grail.
    What is your favorite color?  It is blue.
@@ -542,7 +542,7 @@ returns a new sorted list while leaving the source unaltered. ::
    >>> basket = ['apple', 'orange', 'apple', 'pear', 'orange', 'banana']
    >>> for f in sorted(set(basket)):
    ...     print(f)
-   ...         
+   ...
    apple
    banana
    orange

diff --git a/Doc/using/unix.rst b/Doc/using/unix.rst
index d56d42246bfa891f55ba9bc427672a58808bf347..3d562a8b09f86825c04e256a228c5841518e98b0 100644 (file)
--- a/Doc/using/unix.rst
+++ b/Doc/using/unix.rst
@@ -19,7 +19,7 @@ Python comes preinstalled on most Linux distributions, and is available as a
 package on all others.  However there are certain features you might want to use
 that are not available on your distro's package.  You can easily compile the
 latest version of Python from source.
-       
+
 In the event that Python doesn't come preinstalled and isn't in the repositories as
 well, you can easily make packages for your own distro.  Have a look at the
 following links:
@@ -46,7 +46,7 @@ On FreeBSD and OpenBSD
 * OpenBSD users use::
 
      pkg_add ftp://ftp.openbsd.org/pub/OpenBSD/4.2/packages/<insert your architecture here>/python-<version>.tgz
-       
+
   For example i386 users get the 2.5.1 version of Python using::
 
      pkg_add ftp://ftp.openbsd.org/pub/OpenBSD/4.2/packages/i386/python-2.5.1p2.tgz

diff --git a/Doc/whatsnew/2.4.rst b/Doc/whatsnew/2.4.rst
index d608c2b462b43d6e6064c4ac0d51a71ae5f20f88..2c0cc0489f6a959aec1f3e7c36d7d36fa955cb4b 100644 (file)
--- a/Doc/whatsnew/2.4.rst
+++ b/Doc/whatsnew/2.4.rst
@@ -1175,7 +1175,7 @@ complete list of changes, or look through the CVS logs for all the details.
      import logging
      logging.basicConfig(filename='/var/log/application.log',
          level=0,  # Log all messages
-         format='%(levelname):%(process):%(thread):%(message)')        
+         format='%(levelname):%(process):%(thread):%(message)')
 
   Other additions to the :mod:`logging` package include a :meth:`log(level, msg)`
   convenience method, as well as a :class:`TimedRotatingFileHandler` class that