diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-03-21 22:36:19 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-03-21 22:36:19 (GMT) |
| commit | 2614cda20910e1b2529d5af4a95327f8cdfcc35a (patch) | |
| tree | 4a2d95569150aa2b6f81eb8ea921eac67afa2bf8 /Doc | |
| parent | b5023a1433c4afbf2460a6433593769d1d99bee5 (diff) | |
| download | cpython-2614cda20910e1b2529d5af4a95327f8cdfcc35a.zip cpython-2614cda20910e1b2529d5af4a95327f8cdfcc35a.tar.gz cpython-2614cda20910e1b2529d5af4a95327f8cdfcc35a.tar.bz2 | |
Merged revisions 78338,78345-78346,78561-78562,78566,78574,78581,78634,78660,78675 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78338 | andrew.kuchling | 2010-02-22 15:04:02 -0600 (Mon, 22 Feb 2010) | 4 lines
Remove Tools/modulator, a reference to it in the docs, and a screenshot of it.
(I asked the BDFL first, and he approved removing it. The last actual bugfix
to Tools/modulator was in 2001; since then all changes have been search-and-replace:
string methods, whitespace fixes, etc.)
........
r78345 | andrew.kuchling | 2010-02-22 17:10:52 -0600 (Mon, 22 Feb 2010) | 1 line
#7706: DONT_HAVE_ERRNO_H is no longer defined by configure (after rev.46819).
........
r78346 | andrew.kuchling | 2010-02-22 17:12:00 -0600 (Mon, 22 Feb 2010) | 1 line
#7706: add include guards where they're missing; required for Windows CE
........
r78561 | andrew.kuchling | 2010-03-01 13:51:43 -0600 (Mon, 01 Mar 2010) | 1 line
#7191: describe more details of wbits parameter
........
r78562 | andrew.kuchling | 2010-03-01 14:11:57 -0600 (Mon, 01 Mar 2010) | 1 line
#7637: avoid repeated-concatenation antipattern in example
........
r78566 | barry.warsaw | 2010-03-01 15:46:51 -0600 (Mon, 01 Mar 2010) | 4 lines
Manually copy patch for bug 7250 from the release26-maint branch. I suck
because I did this in the wrong order and couldn't smack svnmerge into
submission.
........
r78574 | benjamin.peterson | 2010-03-01 17:25:13 -0600 (Mon, 01 Mar 2010) | 1 line
remove CVS id
........
r78581 | michael.foord | 2010-03-02 08:22:15 -0600 (Tue, 02 Mar 2010) | 1 line
Link correction in documentation.
........
r78634 | benjamin.peterson | 2010-03-03 15:28:25 -0600 (Wed, 03 Mar 2010) | 1 line
rephrase
........
r78660 | dirkjan.ochtman | 2010-03-04 13:21:53 -0600 (Thu, 04 Mar 2010) | 4 lines
Try to fix buildbot breakage from r78384.
Thanks bitdancer and briancurtin for the help.
........
r78675 | florent.xicluna | 2010-03-04 19:12:14 -0600 (Thu, 04 Mar 2010) | 2 lines
These line should not be there.
........
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/extending/extending.rst | 7 | ||||
| -rw-r--r-- | Doc/includes/minidom-example.py | 6 | ||||
| -rw-r--r-- | Doc/library/argparse.rst | 2 | ||||
| -rw-r--r-- | Doc/library/sqlite3.rst | 2 | ||||
| -rw-r--r-- | Doc/library/zlib.rst | 8 |
5 files changed, 12 insertions, 13 deletions
diff --git a/Doc/extending/extending.rst b/Doc/extending/extending.rst index edc2c8c..d5f55c7 100644 --- a/Doc/extending/extending.rst +++ b/Doc/extending/extending.rst @@ -381,12 +381,7 @@ source distribution. A more substantial example module is included in the Python source distribution as :file:`Modules/xxmodule.c`. This file may be used as a template or simply -read as an example. The :program:`modulator.py` script included in the source -distribution or Windows install provides a simple graphical user interface for -declaring the functions and objects which a module should implement, and can -generate a template which can be filled in. The script lives in the -:file:`Tools/modulator/` directory; see the :file:`README` file there for more -information. +read as an example. .. _compilation: diff --git a/Doc/includes/minidom-example.py b/Doc/includes/minidom-example.py index 88048c0..5ee7682 100644 --- a/Doc/includes/minidom-example.py +++ b/Doc/includes/minidom-example.py @@ -19,11 +19,11 @@ document = """\ dom = xml.dom.minidom.parseString(document) def getText(nodelist): - rc = "" + rc = [] for node in nodelist: if node.nodeType == node.TEXT_NODE: - rc = rc + node.data - return rc + rc.append(node.data) + return ''.join(rc) def handleSlideshow(slideshow): print("<html>") diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst index 53d86a0..0515688 100644 --- a/Doc/library/argparse.rst +++ b/Doc/library/argparse.rst @@ -67,7 +67,7 @@ The following sections walk you through this example. Creating a parser ^^^^^^^^^^^^^^^^^ -Mose uses of the :mod:`argparse` module will start out by creating an +The first step in using the :mod:`argparse` is creating an :class:`ArgumentParser` object:: >>> parser = argparse.ArgumentParser(description='Process some integers.') diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst index 8225efb..ad6a641 100644 --- a/Doc/library/sqlite3.rst +++ b/Doc/library/sqlite3.rst @@ -90,7 +90,7 @@ This example uses the iterator form:: .. seealso:: - http://www.pysqlite.org + http://code.google.com/p/pysqlite/ The pysqlite web page -- sqlite3 is developed externally under the name "pysqlite". diff --git a/Doc/library/zlib.rst b/Doc/library/zlib.rst index 4bd8019..44e9edb 100644 --- a/Doc/library/zlib.rst +++ b/Doc/library/zlib.rst @@ -96,14 +96,18 @@ The available exception and functions in this module are: Decompresses the data in *string*, returning a string containing the uncompressed data. The *wbits* parameter controls the size of the window - buffer. If *bufsize* is given, it is used as the initial size of the output + buffer, and is discussed further below. + If *bufsize* is given, it is used as the initial size of the output buffer. Raises the :exc:`error` exception if any error occurs. The absolute value of *wbits* is the base two logarithm of the size of the history buffer (the "window size") used when compressing data. Its absolute value should be between 8 and 15 for the most recent versions of the zlib library, larger values resulting in better compression at the expense of greater - memory usage. The default value is 15. When *wbits* is negative, the standard + memory usage. When decompressing a stream, *wbits* must not be smaller + than the size originally used to compress the stream; using a too-small + value will result in an exception. The default value is therefore the + highest value, 15. When *wbits* is negative, the standard :program:`gzip` header is suppressed; this is an undocumented feature of the zlib library, used for compatibility with :program:`unzip`'s compression file format. |