INSTALLATION: Remove the coexist.patch instructions

****************
setup.py:

Remove the idles script, add some words on IDLE Fork to the
long_description, and clean up some line spacing.

diff --git a/Lib/idlelib/INSTALLATION b/Lib/idlelib/INSTALLATION
index d9011d0acbf6b58d9d6110339d94b9107b46d051..369395fbda85dd647296acc4a1d1bf1f0dea879d 100644 (file)
--- a/Lib/idlelib/INSTALLATION
+++ b/Lib/idlelib/INSTALLATION
@@ -35,20 +35,4 @@ itself).
 # exit    from root
 
 NOTE that the above procedure will install idlefork IDLE on top of any
-"official" IDLE that may be already installed.  If you wish to avoid doing
-that, there is a patch file, coexist.patch, in the idlefork directory. If,
-_*before*_ you install idle, you run
-
-# patch -p0 < coexist.patch
-
-idlefork will be modified so that it installs as .../site-packages/fildlelib,
-idle as fidle, and idles as fidles. (If you previously installed without
-patching, remove the idlefork/build directory before running the install.)
-
-NOTE: You must then append "fidlelib" to site-packages.pth !
-
-Then "official" IDLE and idlefork IDLE will exist side by side for comparision.
-And if idlefork is temporarily broken :-(, well, you have your old IDLE ways.
-
-This is obviously an expedient development hack, but if popular, I imagine
-there could be a setup option.
+"official" IDLE that may be already installed.
\ No newline at end of file

diff --git a/Lib/idlelib/setup.py b/Lib/idlelib/setup.py
index ecdf92e32eda684d3e3faf29c98db7c035326b3f..e6835120959ef520b4e99faf7d7aeee2a24f9bc6 100644 (file)
--- a/Lib/idlelib/setup.py
+++ b/Lib/idlelib/setup.py
@@ -55,15 +55,15 @@ class idle_build_py(build_py):
 
 # Arghhh. install_lib thinks that all files returned from build_py's
 # get_outputs are bytecode files
+
 class idle_install_lib(install_lib):
     def _bytecode_filenames(self, files):
         files = [n for n in files if n.endswith('.py')]
         return install_lib._bytecode_filenames(self,files)
 
-
 setup(name="IDLE",
       version = idlever.IDLE_VERSION,
-      description = "IDLE, the Python IDE",
+      description = "IDLE Fork, the Forked Python IDE",
       author = "Guido van Rossum",
       author_email = "guido@python.org",
       #url =
@@ -71,11 +71,16 @@ setup(name="IDLE",
 """IDLE is a Tkinter based IDE for Python. It is written in 100% pure
 Python and works both on Windows and Unix. It features a multi-window
 text editor with multiple undo, Python colorizing, and many other things,
-as well as a Python shell window and a debugger.""",
+as well as a Python shell window and a debugger.
+
+IDLE Fork is a separate line of development which was initiated by D. Scherer
+at CMU as part of Visual Python.  It features execution in a separate
+process, with a fresh environment for each run. For further details, 
+refer to idlefork.sourceforge.net.""",
 
       cmdclass = {'build_py':idle_build_py,
                   'install_lib':idle_install_lib},
       package_dir = {idlelib:'.'},
       packages = [idlelib],
-      scripts = ['idle', 'idles']
+      scripts = ['idle']
       )