diff options
| -rw-r--r-- | Doc/extending/newtypes.rst | 2 | ||||
| -rw-r--r-- | Doc/howto/regex.rst | 2 | ||||
| -rw-r--r-- | Doc/library/bdb.rst | 2 | ||||
| -rw-r--r-- | Doc/library/urllib.request.rst | 4 | ||||
| -rw-r--r-- | Doc/library/xmlrpc.client.rst | 4 | ||||
| -rw-r--r-- | Doc/reference/lexical_analysis.rst | 2 | ||||
| -rw-r--r-- | Doc/reference/simple_stmts.rst | 4 | ||||
| -rw-r--r-- | Doc/tutorial/classes.rst | 2 | ||||
| -rw-r--r-- | Doc/tutorial/datastructures.rst | 4 | ||||
| -rw-r--r-- | Doc/using/unix.rst | 4 | ||||
| -rw-r--r-- | Doc/whatsnew/2.4.rst | 2 |
11 files changed, 16 insertions, 16 deletions
diff --git a/Doc/extending/newtypes.rst b/Doc/extending/newtypes.rst index ab84a83..1484c79 100644 --- 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 39a8578..c74fd39 100644 --- 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 b1cf200..9d75a01 100644 --- 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 0b5f892..ec55a04 100644 --- 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 23bb650..9ee0277 100644 --- 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 826e692..5037da0 100644 --- 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 611435a..5793c09 100644 --- 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 d6842e0..7d106fc 100644 --- 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 454472c..75163d0 100644 --- 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 d56d422..3d562a8 100644 --- 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 4ce8132..67478c2 100644 --- 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 |