Skip to content

Commit 2614cda

Browse files
benjaminpbenjaminp
committed
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 python#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 python#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 python#7191: describe more details of wbits parameter ........ r78562 | andrew.kuchling | 2010-03-01 14:11:57 -0600 (Mon, 01 Mar 2010) | 1 line python#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. ........
1 parent b5023a1 commit 2614cda

38 files changed

+24
-1459
lines changed

‎Doc/extending/extending.rst‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -381,12 +381,7 @@ source distribution.
381381

382382
A more substantial example module is included in the Python source distribution
383383
as :file:`Modules/xxmodule.c`. This file may be used as a template or simply
384-
read as an example. The :program:`modulator.py` script included in the source
385-
distribution or Windows install provides a simple graphical user interface for
386-
declaring the functions and objects which a module should implement, and can
387-
generate a template which can be filled in. The script lives in the
388-
:file:`Tools/modulator/` directory; see the :file:`README` file there for more
389-
information.
384+
read as an example.
390385

391386

392387
.. _compilation:

‎Doc/includes/minidom-example.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
dom = xml.dom.minidom.parseString(document)
2020

2121
def getText(nodelist):
22-
rc = ""
22+
rc = []
2323
for node in nodelist:
2424
if node.nodeType == node.TEXT_NODE:
25-
rc = rc + node.data
26-
return rc
25+
rc.append(node.data)
26+
return ''.join(rc)
2727

2828
def handleSlideshow(slideshow):
2929
print("<html>")

‎Doc/library/argparse.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ The following sections walk you through this example.
6767
Creating a parser
6868
^^^^^^^^^^^^^^^^^
6969

70-
Mose uses of the :mod:`argparse` module will start out by creating an
70+
The first step in using the :mod:`argparse` is creating an
7171
:class:`ArgumentParser` object::
7272

7373
>>> parser = argparse.ArgumentParser(description='Process some integers.')

‎Doc/library/sqlite3.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ This example uses the iterator form::
9090

9191
.. seealso::
9292

93-
http://www.pysqlite.org
93+
http://code.google.com/p/pysqlite/
9494
The pysqlite web page -- sqlite3 is developed externally under the name
9595
"pysqlite".
9696

‎Doc/library/zlib.rst‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,18 @@ The available exception and functions in this module are:
9696

9797
Decompresses the data in *string*, returning a string containing the
9898
uncompressed data. The *wbits* parameter controls the size of the window
99-
buffer. If *bufsize* is given, it is used as the initial size of the output
99+
buffer, and is discussed further below.
100+
If *bufsize* is given, it is used as the initial size of the output
100101
buffer. Raises the :exc:`error` exception if any error occurs.
101102

102103
The absolute value of *wbits* is the base two logarithm of the size of the
103104
history buffer (the "window size") used when compressing data. Its absolute
104105
value should be between 8 and 15 for the most recent versions of the zlib
105106
library, larger values resulting in better compression at the expense of greater
106-
memory usage. The default value is 15. When *wbits* is negative, the standard
107+
memory usage. When decompressing a stream, *wbits* must not be smaller
108+
than the size originally used to compress the stream; using a too-small
109+
value will result in an exception. The default value is therefore the
110+
highest value, 15. When *wbits* is negative, the standard
107111
:program:`gzip` header is suppressed; this is an undocumented feature of the
108112
zlib library, used for compatibility with :program:`unzip`'s compression file
109113
format.

‎Modules/_cursesmodule.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
* PERFORMANCE OF THIS SOFTWARE.
3232
*/
3333

34-
/* CVS: $Id$ */
35-
3634
/*
3735
3836
A number of SysV or ncurses functions don't have wrappers yet; if you

‎Modules/_io/fileio.c‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,15 @@
22

33
#define PY_SSIZE_T_CLEAN
44
#include "Python.h"
5+
#ifdef HAVE_SYS_TYPES_H
56
#include <sys/types.h>
7+
#endif
8+
#ifdef HAVE_SYS_STAT_H
69
#include <sys/stat.h>
10+
#endif
11+
#ifdef HAVE_FCNTL_H
712
#include <fcntl.h>
13+
#endif
814
#include <stddef.h> /* For offsetof */
915
#include "_iomodule.h"
1016

‎Modules/signalmodule.c‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,17 @@
77
#include "intrcheck.h"
88

99
#ifdef MS_WINDOWS
10+
#ifdef HAVE_PROCESS_H
1011
#include <process.h>
1112
#endif
13+
#endif
1214

15+
#ifdef HAVE_SIGNAL_H
1316
#include <signal.h>
14-
17+
#endif
18+
#ifdef HAVE_SYS_STAT_H
1519
#include <sys/stat.h>
20+
#endif
1621
#ifdef HAVE_SYS_TIME_H
1722
#include <sys/time.h>
1823
#endif

‎Tools/README‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ i18n Tools for internationalization. pygettext.py
2121
and msgfmt.py generates a binary message catalog
2222
from a catalog in text format.
2323

24-
modulator Interactively generate boiler plate for an extension
25-
module. Works easiest if you have Tk.
26-
2724
pynche A Tkinter-based color editor.
2825

2926
scripts A number of useful single-file programs, e.g. tabnanny.py

‎Tools/modulator/EXAMPLE.py‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)