diff options
| -rw-r--r-- | Doc/extending/embedding.rst | 3 | ||||
| -rw-r--r-- | Doc/library/curses.rst | 2 | ||||
| -rw-r--r-- | Doc/library/imp.rst | 7 | ||||
| -rw-r--r-- | Doc/library/tkinter.rst | 4 | ||||
| -rw-r--r-- | Doc/library/tkinter.tix.rst | 6 | ||||
| -rw-r--r-- | Doc/library/turtle.rst | 5 | ||||
| -rw-r--r-- | Mac/Makefile.in | 4 | ||||
| -rw-r--r-- | Mac/README | 4 | ||||
| -rw-r--r-- | Makefile.pre.in | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 7 |
10 files changed, 16 insertions, 30 deletions
diff --git a/Doc/extending/embedding.rst b/Doc/extending/embedding.rst index 13a8e25..e261048 100644 --- a/Doc/extending/embedding.rst +++ b/Doc/extending/embedding.rst @@ -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:: diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst index f9ba0d6..369571a 100644 --- a/Doc/library/curses.rst +++ b/Doc/library/curses.rst @@ -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. diff --git a/Doc/library/imp.rst b/Doc/library/imp.rst index 398698f..6e9845e 100644 --- a/Doc/library/imp.rst +++ b/Doc/library/imp.rst @@ -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. - diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst index cf92ed4..ae5635f 100644 --- a/Doc/library/tkinter.rst +++ b/Doc/library/tkinter.rst @@ -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"``. diff --git a/Doc/library/tkinter.tix.rst b/Doc/library/tkinter.tix.rst index 68d8f5a..cc7ffd1 100644 --- a/Doc/library/tkinter.tix.rst +++ b/Doc/library/tkinter.tix.rst @@ -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 diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst index c2b9f41..4f2fbcc 100644 --- a/Doc/library/turtle.rst +++ b/Doc/library/turtle.rst @@ -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:: diff --git a/Mac/Makefile.in b/Mac/Makefile.in index 3c974a0..c5cd333 100644 --- a/Mac/Makefile.in +++ b/Mac/Makefile.in @@ -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 @@ -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? diff --git a/Makefile.pre.in b/Makefile.pre.in index 323f68d..63ee79b 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -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)" @@ -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? ================================ |