Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit c62efa8

Browse files
birkenfeldbirkenfeld
committed
Merged revisions 82301 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ................ r82301 | benjamin.peterson | 2010-06-28 00:32:30 +0200 (Mo, 28 Jun 2010) | 303 lines Merged revisions 80605-80609,80642-80646,80651-80652,80674,80684-80686,80748,80852,80854,80870,80872-80873,80907,80915-80916,80951-80952,80976-80977,80985,81038-81040,81042,81053,81070,81104-81105,81114,81125,81245,81285,81402,81463,81516,81562-81563,81567,81593,81635,81680-81681,81684,81801,81888,81931-81933,81939-81942,81963,81984,81991,82120,82188,82264-82267 via svnmerge from svn+ssh://[email protected]/python/trunk ........ r80605 | andrew.kuchling | 2010-04-28 19:22:16 -0500 (Wed, 28 Apr 2010) | 1 line Add various items ........ r80606 | andrew.kuchling | 2010-04-28 20:44:30 -0500 (Wed, 28 Apr 2010) | 6 lines Fix doubled 'the'. Markup fixes to use :exc:, :option: in a few places. (Glitch: unittest.main's -c ends up a link to the Python interpreter's -c option. Should we skip using :option: for that switch, or disable the auto-linking somehow?) ........ r80607 | andrew.kuchling | 2010-04-28 20:45:41 -0500 (Wed, 28 Apr 2010) | 1 line Add various unittest items ........ r80608 | benjamin.peterson | 2010-04-28 22:18:05 -0500 (Wed, 28 Apr 2010) | 1 line update pypy description ........ r80609 | benjamin.peterson | 2010-04-28 22:30:59 -0500 (Wed, 28 Apr 2010) | 1 line update pypy url ........ r80642 | andrew.kuchling | 2010-04-29 19:49:09 -0500 (Thu, 29 Apr 2010) | 1 line Always add space after RFC; reword paragraph ........ r80643 | andrew.kuchling | 2010-04-29 19:52:31 -0500 (Thu, 29 Apr 2010) | 6 lines Reword paragraph to make its meaning clearer. Antoine Pitrou: is my version of the paragraph still correct? R. David Murray: is this more understandable than the previous version? ........ r80644 | andrew.kuchling | 2010-04-29 20:02:15 -0500 (Thu, 29 Apr 2010) | 1 line Fix typos ........ r80645 | andrew.kuchling | 2010-04-29 20:32:47 -0500 (Thu, 29 Apr 2010) | 1 line Markup fix; clarify by adding 'in that order' ........ r80646 | andrew.kuchling | 2010-04-29 20:33:40 -0500 (Thu, 29 Apr 2010) | 1 line Add various items; rearrange unittest section a bit ........ r80651 | andrew.kuchling | 2010-04-30 08:46:55 -0500 (Fri, 30 Apr 2010) | 1 line Minor grammar re-wording ........ r80652 | andrew.kuchling | 2010-04-30 08:47:34 -0500 (Fri, 30 Apr 2010) | 1 line Add item ........ r80674 | andrew.kuchling | 2010-04-30 20:19:16 -0500 (Fri, 30 Apr 2010) | 1 line Add various items ........ r80684 | andrew.kuchling | 2010-05-01 07:05:52 -0500 (Sat, 01 May 2010) | 1 line Minor grammar fix ........ r80685 | andrew.kuchling | 2010-05-01 07:06:51 -0500 (Sat, 01 May 2010) | 1 line Describe memoryview ........ r80686 | antoine.pitrou | 2010-05-01 07:16:39 -0500 (Sat, 01 May 2010) | 4 lines Fix attribution. Travis didn't do much and he did a bad work. (yes, this is a sensitive subject, sorry) ........ r80748 | andrew.kuchling | 2010-05-03 20:24:22 -0500 (Mon, 03 May 2010) | 1 line Add some more items; the urlparse change is added twice ........ r80852 | andrew.kuchling | 2010-05-05 20:09:47 -0500 (Wed, 05 May 2010) | 1 line Reword paragraph; fix filename, which should be pyconfig.h ........ r80854 | andrew.kuchling | 2010-05-05 20:10:56 -0500 (Wed, 05 May 2010) | 1 line Add various items ........ r80870 | andrew.kuchling | 2010-05-06 09:14:09 -0500 (Thu, 06 May 2010) | 1 line Describe ElementTree 1.3; rearrange new-module sections; describe dict views as sets; small edits and items ........ r80872 | andrew.kuchling | 2010-05-06 12:21:59 -0500 (Thu, 06 May 2010) | 1 line Add 2 items; record ideas for two initial sections; clarify wording ........ r80873 | andrew.kuchling | 2010-05-06 12:27:57 -0500 (Thu, 06 May 2010) | 1 line Change section title; point to unittest2 ........ r80907 | andrew.kuchling | 2010-05-06 20:45:14 -0500 (Thu, 06 May 2010) | 1 line Add a new section on the development plan; add an item ........ r80915 | antoine.pitrou | 2010-05-07 05:15:51 -0500 (Fri, 07 May 2010) | 3 lines Fix some markup and a class name. Also, wrap a long line. ........ r80916 | andrew.kuchling | 2010-05-07 06:30:47 -0500 (Fri, 07 May 2010) | 1 line Re-word text ........ r80951 | andrew.kuchling | 2010-05-07 20:15:26 -0500 (Fri, 07 May 2010) | 1 line Add two items ........ r80952 | andrew.kuchling | 2010-05-07 20:35:55 -0500 (Fri, 07 May 2010) | 1 line Get accents correct ........ r80976 | andrew.kuchling | 2010-05-08 08:28:03 -0500 (Sat, 08 May 2010) | 1 line Add logging.dictConfig example; give up on writing a Ttk example ........ r80977 | andrew.kuchling | 2010-05-08 08:29:46 -0500 (Sat, 08 May 2010) | 1 line Markup fixes ........ r80985 | andrew.kuchling | 2010-05-08 10:39:46 -0500 (Sat, 08 May 2010) | 7 lines Write summary of the 2.7 release; rewrite the future section some more; mention PYTHONWARNINGS env. var; tweak some examples for readability. And with this commit, the "What's New" is done... except for a complete read-through to polish the text, and fixing any reported errors, but those tasks can easily wait until after beta2. ........ r81038 | benjamin.peterson | 2010-05-09 16:09:40 -0500 (Sun, 09 May 2010) | 1 line finish clause ........ r81039 | andrew.kuchling | 2010-05-10 09:18:27 -0500 (Mon, 10 May 2010) | 1 line Markup fix; re-word a sentence ........ r81040 | andrew.kuchling | 2010-05-10 09:20:12 -0500 (Mon, 10 May 2010) | 1 line Use title case ........ r81042 | andrew.kuchling | 2010-05-10 10:03:35 -0500 (Mon, 10 May 2010) | 1 line Link to unittest2 article ........ r81053 | florent.xicluna | 2010-05-10 14:59:22 -0500 (Mon, 10 May 2010) | 2 lines Add a link on maketrans(). ........ r81070 | andrew.kuchling | 2010-05-10 18:13:41 -0500 (Mon, 10 May 2010) | 1 line Fix typo ........ r81104 | andrew.kuchling | 2010-05-11 19:38:44 -0500 (Tue, 11 May 2010) | 1 line Revision pass: lots of edits, typo fixes, rearrangements ........ r81105 | andrew.kuchling | 2010-05-11 19:40:47 -0500 (Tue, 11 May 2010) | 1 line Let's call this done ........ r81114 | andrew.kuchling | 2010-05-12 08:56:07 -0500 (Wed, 12 May 2010) | 1 line Grammar fix ........ r81125 | andrew.kuchling | 2010-05-12 13:56:48 -0500 (Wed, 12 May 2010) | 1 line #8696: add documentation for logging.config.dictConfig (PEP 391) ........ r81245 | andrew.kuchling | 2010-05-16 18:31:16 -0500 (Sun, 16 May 2010) | 1 line Add cross-reference to later section ........ r81285 | vinay.sajip | 2010-05-18 03:16:27 -0500 (Tue, 18 May 2010) | 1 line Fixed minor typo in ReST markup. ........ r81402 | vinay.sajip | 2010-05-21 12:41:34 -0500 (Fri, 21 May 2010) | 1 line Updated logging documentation with more dictConfig information. ........ r81463 | georg.brandl | 2010-05-22 03:17:23 -0500 (Sat, 22 May 2010) | 1 line #8785: less confusing description of regex.find*. ........ r81516 | andrew.kuchling | 2010-05-25 08:34:08 -0500 (Tue, 25 May 2010) | 1 line Add three items ........ r81562 | andrew.kuchling | 2010-05-27 08:22:53 -0500 (Thu, 27 May 2010) | 1 line Rewrite wxWidgets section ........ r81563 | andrew.kuchling | 2010-05-27 08:30:09 -0500 (Thu, 27 May 2010) | 1 line Remove top-level 'General Questions' section, pushing up the questions it contains ........ r81567 | andrew.kuchling | 2010-05-27 16:29:59 -0500 (Thu, 27 May 2010) | 1 line Add item ........ r81593 | georg.brandl | 2010-05-29 03:46:18 -0500 (Sat, 29 May 2010) | 1 line #8616: add new turtle demo "nim". ........ r81635 | georg.brandl | 2010-06-01 02:25:23 -0500 (Tue, 01 Jun 2010) | 1 line Put docs for RegexObject.search() before RegexObject.match() to mirror re.search() and re.match() order. ........ r81680 | vinay.sajip | 2010-06-03 17:34:42 -0500 (Thu, 03 Jun 2010) | 1 line Issue #8890: Documentation changed to avoid reference to temporary files. ........ r81681 | sean.reifschneider | 2010-06-03 20:51:26 -0500 (Thu, 03 Jun 2010) | 2 lines Issue8810: Clearing up docstring for tzinfo.utcoffset. ........ r81684 | vinay.sajip | 2010-06-04 08:41:02 -0500 (Fri, 04 Jun 2010) | 1 line Issue #8890: Documentation changed to avoid reference to temporary files - other cases covered. ........ r81801 | andrew.kuchling | 2010-06-07 08:38:40 -0500 (Mon, 07 Jun 2010) | 1 line #8875: Remove duplicated paragraph ........ r81888 | andrew.kuchling | 2010-06-10 20:54:58 -0500 (Thu, 10 Jun 2010) | 1 line Add a few more items ........ r81931 | georg.brandl | 2010-06-12 01:26:54 -0500 (Sat, 12 Jun 2010) | 1 line Fix punctuation. ........ r81932 | georg.brandl | 2010-06-12 01:28:58 -0500 (Sat, 12 Jun 2010) | 1 line Document that an existing directory raises in mkdir(). ........ r81933 | georg.brandl | 2010-06-12 01:45:33 -0500 (Sat, 12 Jun 2010) | 1 line Update version in README. ........ r81939 | georg.brandl | 2010-06-12 04:45:01 -0500 (Sat, 12 Jun 2010) | 1 line Use newer toctree syntax. ........ r81940 | georg.brandl | 2010-06-12 04:45:28 -0500 (Sat, 12 Jun 2010) | 1 line Add document on how to build. ........ r81941 | georg.brandl | 2010-06-12 04:45:58 -0500 (Sat, 12 Jun 2010) | 1 line Fix gratuitous indentation. ........ r81942 | georg.brandl | 2010-06-12 04:46:03 -0500 (Sat, 12 Jun 2010) | 1 line Update README. ........ r81963 | andrew.kuchling | 2010-06-12 15:00:55 -0500 (Sat, 12 Jun 2010) | 1 line Grammar fix ........ r81984 | georg.brandl | 2010-06-14 10:58:39 -0500 (Mon, 14 Jun 2010) | 1 line #8993: fix reference. ........ r81991 | andrew.kuchling | 2010-06-14 19:38:58 -0500 (Mon, 14 Jun 2010) | 1 line Add another bunch of items ........ r82120 | andrew.kuchling | 2010-06-20 16:45:45 -0500 (Sun, 20 Jun 2010) | 1 line Note that Python 3.x isn't covered; add forward ref. for UTF-8; note error in 2.5 and up ........ r82188 | benjamin.peterson | 2010-06-23 19:02:46 -0500 (Wed, 23 Jun 2010) | 1 line remove reverted changed ........ r82264 | georg.brandl | 2010-06-27 05:47:47 -0500 (Sun, 27 Jun 2010) | 1 line Confusing punctuation. ........ r82265 | georg.brandl | 2010-06-27 05:49:23 -0500 (Sun, 27 Jun 2010) | 1 line Use designated syntax for optional grammar element. ........ r82266 | georg.brandl | 2010-06-27 05:51:44 -0500 (Sun, 27 Jun 2010) | 1 line Fix URL. ........ r82267 | georg.brandl | 2010-06-27 05:55:38 -0500 (Sun, 27 Jun 2010) | 1 line Two typos. ........ ................
1 parent 725443f commit c62efa8

26 files changed

Lines changed: 2301 additions & 389 deletions

‎Doc/README.txt‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@ those familiar with the previous docs written in LaTeX.
1414
Building the docs
1515
=================
1616

17-
You need to install Python 2.4 or higher (but Python 3.0 is not supported yet);
18-
the toolset used to build the docs are written in Python. The toolset used
19-
to build the documentation is called *Sphinx*, it is not included in this
20-
tree, but maintained separately in the Python Subversion repository. Also
21-
needed are Jinja, a templating engine (included in Sphinx as a Subversion
22-
external), and optionally Pygments, a code highlighter.
17+
You need to have Python 2.4 or higher installed; the toolset used to build the
18+
docs is written in Python. It is called *Sphinx*, it is not included in this
19+
tree, but maintained separately. Also needed are the docutils, supplying the
20+
base markup that Sphinx uses, Jinja, a templating engine, and optionally
21+
Pygments, a code highlighter.
2322

2423

2524
Using make
@@ -47,29 +46,29 @@ Available make targets are:
4746
convert them into a single Compiled HTML (.chm) file -- these are popular
4847
under Microsoft Windows, but very handy on every platform.
4948

50-
To create the CHM file, you need to run the Microsoft HTML Help Workshop
51-
over the generated project (.hhp) file.
49+
To create the CHM file, you need to run the Microsoft HTML Help Workshop over
50+
the generated project (.hhp) file.
5251

53-
* "latex", which builds LaTeX source files that can be run with "pdflatex"
54-
to produce PDF documents.
52+
* "latex", which builds LaTeX source files as input to "pdflatex" to produce
53+
PDF documents.
5554

5655
* "text", which builds a plain text file for each source file.
5756

5857
* "linkcheck", which checks all external references to see whether they are
59-
broken, redirected or malformed, and outputs this information to stdout
60-
as well as a plain-text (.txt) file.
58+
broken, redirected or malformed, and outputs this information to stdout as
59+
well as a plain-text (.txt) file.
6160

6261
* "changes", which builds an overview over all versionadded/versionchanged/
6362
deprecated items in the current version. This is meant as a help for the
6463
writer of the "What's New" document.
6564

66-
* "coverage", which builds a coverage overview for standard library modules
67-
and C API.
65+
* "coverage", which builds a coverage overview for standard library modules and
66+
C API.
6867

69-
* "pydoc-topics", which builds a Python module containing a dictionary
70-
with plain text documentation for the labels defined in
71-
`tools/sphinxext/pyspecific.py` -- pydoc needs these to show topic
72-
and keyword help.
68+
* "pydoc-topics", which builds a Python module containing a dictionary with
69+
plain text documentation for the labels defined in
70+
`tools/sphinxext/pyspecific.py` -- pydoc needs these to show topic and
71+
keyword help.
7372

7473
A "make update" updates the Subversion checkouts in `tools/`.
7574

@@ -95,7 +94,7 @@ You also need Jinja2, either by checking it out via ::
9594

9695
or by installing it from PyPI.
9796

98-
You can optionally also install Pygments, either as a checkout via ::
97+
You can optionally also install Pygments, either as a checkout via ::
9998

10099
svn co http://svn.python.org/projects/external/Pygments-1.3.1/pygments tools/pygments
101100

‎Doc/c-api/init.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ Initialization, Finalization, and Threads
392392
393393
.. cfunction:: void PySys_SetArgv(int argc, wchar_t **argv)
394394

395-
This function works like :cfunc:`PySys_SetArgv` with *updatepath* set to 1.
395+
This function works like :cfunc:`PySys_SetArgvEx` with *updatepath* set to 1.
396396

397397

398398
.. cfunction:: void Py_SetPythonHome(wchar_t *home)

‎Doc/distutils/builtdist.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ the :option:`--no-target-compile` and/or the :option:`--no-target-optimize`
321321
option.
322322

323323
By default the installer will display the cool "Python Powered" logo when it is
324-
run, but you can also supply your own 152x161 bitmap which must be a Windows
324+
run, but you can also supply your own 152x261 bitmap which must be a Windows
325325
:file:`.bmp` file with the :option:`--bitmap` option.
326326

327327
The installer will also display a large title on the desktop background window
@@ -374,7 +374,7 @@ check or modify your existing install.)
374374
The Postinstallation script
375375
---------------------------
376376

377-
Starting with Python 2.3, a postinstallation script can be specified which the
377+
Starting with Python 2.3, a postinstallation script can be specified with the
378378
:option:`--install-script` option. The basename of the script must be
379379
specified, and the script filename must also be listed in the scripts argument
380380
to the setup function.

‎Doc/documenting/building.rst‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
Building the documentation
2+
==========================
3+
4+
You need to have Python 2.4 or higher installed; the toolset used to build the
5+
docs is written in Python. It is called *Sphinx*, it is not included in this
6+
tree, but maintained separately. Also needed are the docutils, supplying the
7+
base markup that Sphinx uses, Jinja, a templating engine, and optionally
8+
Pygments, a code highlighter.
9+
10+
11+
Using make
12+
----------
13+
14+
Luckily, a Makefile has been prepared so that on Unix, provided you have
15+
installed Python and Subversion, you can just run ::
16+
17+
make html
18+
19+
to check out the necessary toolset in the `tools/` subdirectory and build the
20+
HTML output files. To view the generated HTML, point your favorite browser at
21+
the top-level index `build/html/index.html` after running "make".
22+
23+
Available make targets are:
24+
25+
* "html", which builds standalone HTML files for offline viewing.
26+
27+
* "htmlhelp", which builds HTML files and a HTML Help project file usable to
28+
convert them into a single Compiled HTML (.chm) file -- these are popular
29+
under Microsoft Windows, but very handy on every platform.
30+
31+
To create the CHM file, you need to run the Microsoft HTML Help Workshop
32+
over the generated project (.hhp) file.
33+
34+
* "latex", which builds LaTeX source files as input to "pdflatex" to produce
35+
PDF documents.
36+
37+
* "text", which builds a plain text file for each source file.
38+
39+
* "linkcheck", which checks all external references to see whether they are
40+
broken, redirected or malformed, and outputs this information to stdout
41+
as well as a plain-text (.txt) file.
42+
43+
* "changes", which builds an overview over all versionadded/versionchanged/
44+
deprecated items in the current version. This is meant as a help for the
45+
writer of the "What's New" document.
46+
47+
* "coverage", which builds a coverage overview for standard library modules
48+
and C API.
49+
50+
* "pydoc-topics", which builds a Python module containing a dictionary with
51+
plain text documentation for the labels defined in
52+
`tools/sphinxext/pyspecific.py` -- pydoc needs these to show topic and
53+
keyword help.
54+
55+
A "make update" updates the Subversion checkouts in `tools/`.
56+
57+
58+
Without make
59+
------------
60+
61+
You'll need to install the Sphinx package, either by checking it out via ::
62+
63+
svn co http://svn.python.org/projects/external/Sphinx-0.6.5/sphinx tools/sphinx
64+
65+
or by installing it from PyPI.
66+
67+
Then, you need to install Docutils, either by checking it out via ::
68+
69+
svn co http://svn.python.org/projects/external/docutils-0.6/docutils tools/docutils
70+
71+
or by installing it from http://docutils.sf.net/.
72+
73+
You also need Jinja2, either by checking it out via ::
74+
75+
svn co http://svn.python.org/projects/external/Jinja-2.3.1/jinja2 tools/jinja2
76+
77+
or by installing it from PyPI.
78+
79+
You can optionally also install Pygments, either as a checkout via ::
80+
81+
svn co http://svn.python.org/projects/external/Pygments-1.3.1/pygments tools/pygments
82+
83+
or from PyPI at http://pypi.python.org/pypi/Pygments.
84+
85+
86+
Then, make an output directory, e.g. under `build/`, and run ::
87+
88+
python tools/sphinx-build.py -b<builder> . build/<outputdirectory>
89+
90+
where `<builder>` is one of html, text, latex, or htmlhelp (for explanations see
91+
the make targets above).

‎Doc/documenting/index.rst‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ contributed by various authors. The markup used for the Python documentation is
1010
`reStructuredText`_, developed by the `docutils`_ project, amended by custom
1111
directives and using a toolset named `Sphinx`_ to postprocess the HTML output.
1212

13-
This document describes the style guide for our documentation, the custom
14-
reStructuredText markup introduced to support Python documentation and how it
15-
should be used, as well as the Sphinx build system.
13+
This document describes the style guide for our documentation as well as the
14+
custom reStructuredText markup introduced by Sphinx to support Python
15+
documentation and how it should be used.
1616

1717
.. _reStructuredText: http://docutils.sf.net/rst.html
1818
.. _docutils: http://docutils.sf.net/
@@ -35,3 +35,4 @@ should be used, as well as the Sphinx build system.
3535
rest.rst
3636
markup.rst
3737
fromlatex.rst
38+
building.rst

‎Doc/documenting/markup.rst‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -698,19 +698,19 @@ tables of contents. The ``toctree`` directive is the central element.
698698
.. toctree::
699699
:maxdepth: 2
700700

701-
intro.rst
702-
strings.rst
703-
datatypes.rst
704-
numeric.rst
701+
intro
702+
strings
703+
datatypes
704+
numeric
705705
(many more files listed here)
706706

707707
This accomplishes two things:
708708

709709
* Tables of contents from all those files are inserted, with a maximum depth
710710
of two, that means one nested heading. ``toctree`` directives in those
711711
files are also taken into account.
712-
* Sphinx knows that the relative order of the files ``intro.rst``,
713-
``strings.rst`` and so forth, and it knows that they are children of the
712+
* Sphinx knows that the relative order of the files ``intro``,
713+
``strings`` and so forth, and it knows that they are children of the
714714
shown file, the library index. From this information it generates "next
715715
chapter", "previous chapter" and "parent chapter" links.
716716

‎Doc/documenting/style.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The Python documentation should follow the `Apple Publications Style Guide`_
77
wherever possible. This particular style guide was selected mostly because it
88
seems reasonable and is easy to get online.
99

10-
Topics which are not covered in the Apple's style guide will be discussed in
10+
Topics which are not covered in Apple's style guide will be discussed in
1111
this document.
1212

1313
All reST files use an indentation of 3 spaces. The maximum line length is 80

‎Doc/faq/gui.rst‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ General GUI Questions
1010
=====================
1111

1212
What platform-independent GUI toolkits exist for Python?
13-
--------------------------------------------------------
13+
========================================================
1414

1515
Depending on what platform(s) you are aiming at, there are several.
1616

1717
.. XXX check links
1818
1919
Tkinter
20-
'''''''
20+
-------
2121

2222
Standard builds of Python include an object-oriented interface to the Tcl/Tk
2323
widget set, called Tkinter. This is probably the easiest to install and use.
@@ -26,23 +26,26 @@ page at http://www.tcl.tk. Tcl/Tk is fully portable to the MacOS, Windows, and
2626
Unix platforms.
2727

2828
wxWindows
29-
'''''''''
29+
---------
3030

31-
wxWindows is a portable GUI class library written in C++ that's a portable
32-
interface to various platform-specific libraries; wxWidgets is a Python
33-
interface to wxWindows. wxWindows supports Windows and MacOS; on Unix variants,
34-
it supports both GTk+ and Motif toolkits. wxWindows preserves the look and feel
35-
of the underlying graphics toolkit, and there is quite a rich widget set and
36-
collection of GDI classes. See `the wxWindows page <http://www.wxwindows.org>`_
37-
for more details.
31+
wxWidgets (http://www.wxwidgets.org) is a free, portable GUI class
32+
library written in C++ that provides a native look and feel on a
33+
number of platforms, with Windows, MacOS X, GTK, X11, all listed as
34+
current stable targets. Language bindings are available for a number
35+
of languages including Python, Perl, Ruby, etc.
3836

39-
`wxWidgets <http://wxwidgets.org>`_ is an extension module that wraps many of
40-
the wxWindows C++ classes, and is quickly gaining popularity amongst Python
41-
developers. You can get wxWidgets as part of the source or CVS distribution of
42-
wxWindows, or directly from its home page.
37+
wxPython (http://www.wxpython.org) is the Python binding for
38+
wxwidgets. While it often lags slightly behind the official wxWidgets
39+
releases, it also offers a number of features via pure Python
40+
extensions that are not available in other language bindings. There
41+
is an active wxPython user and developer community.
42+
43+
Both wxWidgets and wxPython are free, open source, software with
44+
permissive licences that allow their use in commercial products as
45+
well as in freeware or shareware.
4346

4447
Qt
45-
'''
48+
---
4649

4750
There are bindings available for the Qt toolkit (`PyQt
4851
<http://www.riverbankcomputing.co.uk/software/pyqt/>`_) and for KDE (PyKDE). If
@@ -53,35 +56,35 @@ Qt 4.5 upwards is licensed under the LGPL license) a Qt license from `Trolltech
5356
<http://www.trolltech.com>`_.
5457

5558
Gtk+
56-
''''
59+
----
5760

5861
PyGtk bindings for the `Gtk+ toolkit <http://www.gtk.org>`_ have been
5962
implemented by by James Henstridge; see ftp://ftp.gtk.org/pub/gtk/python/.
6063

6164
FLTK
62-
''''
65+
----
6366

6467
Python bindings for `the FLTK toolkit <http://www.fltk.org>`_, a simple yet
6568
powerful and mature cross-platform windowing system, are available from `the
6669
PyFLTK project <http://pyfltk.sourceforge.net>`_.
6770

6871

6972
FOX
70-
'''
73+
----
7174

7275
A wrapper for `the FOX toolkit <http://www.fox-toolkit.org/>`_ called `FXpy
7376
<http://fxpy.sourceforge.net/>`_ is available. FOX supports both Unix variants
7477
and Windows.
7578

7679

7780
OpenGL
78-
''''''
81+
------
7982

8083
For OpenGL bindings, see `PyOpenGL <http://pyopengl.sourceforge.net>`_.
8184

8285

8386
What platform-specific GUI toolkits exist for Python?
84-
-----------------------------------------------------
87+
========================================================
8588

8689
`The Mac port <http://python.org/download/mac>`_ by Jack Jansen has a rich and
8790
ever-growing set of modules that support the native Mac toolbox calls. The port

‎Doc/howto/functional.rst‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
:Author: A. M. Kuchling
66
:Release: 0.31
77

8-
(This is a first draft. Please send comments/error reports/suggestions to
9-
[email protected].)
10-
118
In this document, we'll take a tour of Python's features suitable for
129
implementing programs in a functional style. After an introduction to the
1310
concepts of functional programming, we'll look at language features such as

0 commit comments

Comments
 (0)