Remove mentions of the Demo directory.

This commit is contained in:
Georg Brandl 2010-12-30 22:12:40 +00:00
parent 856898b395
commit 59b44721e3
10 changed files with 16 additions and 30 deletions

View File

@ -35,9 +35,6 @@ stdio file pointer and a file name (for identification in error messages only)
to :c:func:`PyRun_SimpleFile`. You can also call the lower-level operations
described in the previous chapters to construct and use Python objects.
A simple demo of embedding Python can be found in the directory
:file:`Demo/embed/` of the source distribution.
.. seealso::

View File

@ -49,7 +49,7 @@ Linux and the BSD variants of Unix.
Tutorial material on using curses with Python, by Andrew Kuchling and Eric
Raymond.
The :file:`Demo/curses/` directory in the Python source distribution contains
The :file:`Tools/demo/` directory in the Python source distribution contains
some example programs using the curses bindings provided by this module.

View File

@ -308,10 +308,3 @@ in that version, since :func:`find_module` has been extended and
# Since we may exit via an exception, close fp explicitly.
if fp:
fp.close()
.. index:: module: knee
A more complete example that implements hierarchical module names and includes a
:func:`reload` function can be found in the module :mod:`knee`. The :mod:`knee`
module can be found in :file:`Demo/imputil/` in the Python source distribution.

View File

@ -659,9 +659,7 @@ relief
scrollcommand
This is almost always the :meth:`!set` method of some scrollbar widget, but can
be any widget method that takes a single argument. Refer to the file
:file:`Demo/tkinter/matt/canvas-with-scrollbars.py` in the Python source
distribution for an example.
be any widget method that takes a single argument.
wrap:
Must be one of: ``"none"``, ``"char"``, or ``"word"``.

View File

@ -84,11 +84,7 @@ Tix Widgets
-----------
`Tix <http://tix.sourceforge.net/dist/current/man/html/TixCmd/TixIntro.htm>`_
introduces over 40 widget classes to the :mod:`tkinter` repertoire. There is a
demo of all the :mod:`tkinter.tix` widgets in the :file:`Demo/tix` directory of
the standard distribution.
.. The Python sample code is still being added to Python, hence commented out
introduces over 40 widget classes to the :mod:`tkinter` repertoire.
Basic Widgets

View File

@ -2268,7 +2268,7 @@ There can be a :file:`turtle.cfg` file in the directory where :mod:`turtle` is
stored and an additional one in the current working directory. The latter will
override the settings of the first one.
The :file:`Demo/turtle` directory contains a :file:`turtle.cfg` file. You can
The :file:`Lib/turtledemo` directory contains a :file:`turtle.cfg` file. You can
study it as an example and see its effects when running the demos (preferably
not from within the demo-viewer).
@ -2400,8 +2400,7 @@ Changes since Python 3.0
strings and numbers respectively.
- Two example scripts :file:`tdemo_nim.py` and :file:`tdemo_round_dance.py`
have been added to the Demo directory (source distribution only). As usual
they can be viewed and executed within the demo viewer :file:`turtleDemo.py`.
have been added to the :file:`Lib/turtledemo` directory.
.. doctest::

View File

@ -202,10 +202,6 @@ $(INSTALLED_PYTHONAPP): install_Python
installextras: $(srcdir)/Extras.ReadMe.txt $(srcdir)/Extras.install.py
$(INSTALL) -d "$(DESTDIR)$(PYTHONAPPSDIR)/Extras"
$(INSTALL) $(srcdir)/Extras.ReadMe.txt "$(DESTDIR)$(PYTHONAPPSDIR)/Extras/ReadMe.txt"
$(RUNSHARED) $(BUILDPYTHON) $(srcdir)/Extras.install.py $(srcdir)/../Demo \
"$(DESTDIR)$(PYTHONAPPSDIR)/Extras/Demo"
$(RUNSHARED) $(BUILDPYTHON) $(srcdir)/Extras.install.py $(srcdir)/Demo \
"$(DESTDIR)$(PYTHONAPPSDIR)/Extras/Demo.Mac"
checkapplepython: $(srcdir)/Tools/fixapplepython23.py

View File

@ -188,8 +188,8 @@ frameworkinstall is composed of a couple of sub-targets that install the
framework itself, the Mac subtree, the applications and the unix tools.
There is an extra target frameworkinstallextras that is not part of the
normal frameworkinstall which installs the Demo and Tools directories
into "/Applications/MacPython <VERSION>", this is useful for binary
normal frameworkinstall which installs the Tools directory into
"/Applications/MacPython <VERSION>", this is useful for binary
distributions.
What do all these programs do?

View File

@ -154,7 +154,7 @@ CONFIG_ARGS= @CONFIG_ARGS@
SRCDIRS= @SRCDIRS@
# Other subdirectories
SUBDIRSTOO= Include Lib Misc Demo
SUBDIRSTOO= Include Lib Misc
# Files and directories to be distributed
CONFIGFILES= configure configure.in acconfig.h pyconfig.h.in Makefile.pre.in
@ -1155,7 +1155,7 @@ frameworkinstallunixtools:
frameworkaltinstallunixtools:
cd Mac && $(MAKE) altinstallunixtools DESTDIR="$(DESTDIR)"
# This installs the Demos and Tools into the applications directory.
# This installs the Tools into the applications directory.
# It is not part of a normal frameworkinstall
frameworkinstallextras:
cd Mac && $(MAKE) installextras DESTDIR="$(DESTDIR)"

View File

@ -79,6 +79,13 @@ Build
- Issue #10679: The "idle", "pydoc" and "2to3" scripts are now installed with
a version-specific suffix on "make altinstall".
Tools/Demos
-----------
- Issue #7962: The Demo directory is gone. Most of the old and unmaintained
demos have been removed, others integrated in documentation or a new
Tools/demo subdirectory.
What's New in Python 3.2 Beta 2?
================================