diff options
| -rw-r--r-- | Lib/idlelib/CREDITS.txt | 6 | ||||
| -rw-r--r-- | Lib/idlelib/INSTALL.txt | 82 | ||||
| -rw-r--r-- | Lib/idlelib/LICENSE.txt | 29 | ||||
| -rw-r--r-- | Lib/idlelib/aboutDialog.py | 4 | ||||
| -rw-r--r-- | Lib/idlelib/setup.py | 2 |
5 files changed, 78 insertions, 45 deletions
diff --git a/Lib/idlelib/CREDITS.txt b/Lib/idlelib/CREDITS.txt index 795dc5e..01cdfa5 100644 --- a/Lib/idlelib/CREDITS.txt +++ b/Lib/idlelib/CREDITS.txt @@ -20,9 +20,9 @@ Other contributors include Raymond Hettinger, Tony Lownds (Mac integration), Neal Norwitz (code check and clean-up), and Chui Tey (RPC integration, debugger integration and persistent breakpoints). -Hernan Foffani, Christos Georgiou, Martin v. Loewis, Jason Orendorff, -Noam Raphael, Josh Robb, and Bruce Sherwood have submitted useful patches. -Thanks, guys! +Hernan Foffani, Christos Georgiou, Martin v. Loewis, Jason Orendorff, Noam +Raphael, Josh Robb, Nigel Rowe, and Bruce Sherwood have submitted useful +patches. Thanks, guys! There are others who should be included here, especially those who contributed to IDLE versions prior to 0.8, principally Mark Hammond, Jeremy Hylton, diff --git a/Lib/idlelib/INSTALL.txt b/Lib/idlelib/INSTALL.txt index 2488d28..9a01282 100644 --- a/Lib/idlelib/INSTALL.txt +++ b/Lib/idlelib/INSTALL.txt @@ -5,55 +5,85 @@ IDLEfork requires Python Version 2.2 or later. There are several distribution files (where xx is the subversion): -IDLEfork-0.9xx.win32.exe - This is a Windows installer which will install IDLEfork in - ..../site-packages/idleforklib/ and place the idefork startup script - at ..../scripts/idlefork. Rename this to idlefork.pyw and - point your launcher icons at it. Installation is as idlefork - to avoid conflict with the original Python IDLE. - -IDLEfork-0.9xx-1.noarch.rpm - This is an rpm which is designed to install as idleforklib in an - existing /usr/lib/python2.2 tree. It installs as idlefork to avoid - conflict with Python IDLE. - - Python rpms are available at http://www.python.org/2.2.2/rpms.html and - http://www.python.org/2.2.1/rpms.html. +IDLEfork-0.9xx.win32-py2.2.exe +IDLEfork-0.9xx.win32-py2.3.exe + + These are Windows installers which will install IDLEfork in + ..../site-packages/idleforklib/ and place the idefork startup script at + ..../scripts/idlefork. Rename this script to idlefork.pyw and point + your launcher icons at it. Installation is as idlefork to avoid + conflict with the original Python IDLE. Choose the installer + appropriate for your version of Python. IDLEfork-0.9xx.tar.gz This is a distutils sdist (source) tarfile which can be used to make - installations on platforms not supported by the above files. - ** It remains configured to install as idlelib, not idleforklib. ** + installations on non-Windows platforms, or on Windows if a custom + installation is desired. It installs as idlefork and will not + conflict with Python IDLE. Unpack in ..../Tools/, cd to the IDLEfork directory created, and - "python setup.py install" to install in ....site-packages/idlelib. - This will overwrite the Python IDLE installation. + "python setup.py install" to install in ....site-packages/idleforklib. + +IDLE-0.9xx.tar.gz + This is also a distutils sdist (source) tarfile. + + ** It remains configured to install as idlelib, not idleforklib. ** + + First, remove your existing ..../site-packages/idlelib directory. + + Unpack in ..../Tools/, cd to the IDLE directory (note the caps) + created, and "python setup.py install" to install in + ....site-packages/idlelib. This will replace the Python IDLE + installation. + + If you don't want to overwrite Python IDLE, I'd recommend using the + IDLEfork release mentioned above. However, it is also possible to + simply build IDLE without installing it: "python setup.py build" and + then copy the interrupt.so library out of the build directory into the + IDLE directory where IDLE can find it, + + In this case, IDLE will not be on your PATH unless you are in the + source directory. Either append your PATH or use a fully qualified + path to access IDLE, something like + + python /usr/bin/python/Tools/IDLE/idle.py + + That way you can continue to use the original IDLE at + ..../Tools/idle/idle.py if you like. (note lower case) + + Using this approach, it's possible to have many different versions + of IDLE on your system at the same time, for comparison/test. - If you don't want to overwrite Python IDLE, it is also possible to - simply call "python idle.py" to run from the IDLEfork source directory - without making an installation. In this case, IDLE will not be on - your PATH unless you are in the source directory. Also, it is then - advisable to remove any Python IDLE installation by removing - ..../site-packages/idlelib so the two identically named packages don't - conflict. On Redhat Linux systems prior to 8.0, /usr/bin/python may be pointing at python1.5. If so, change the first line in the /usr/bin/idle script to read: + !# /usr/bin/python2.2 + + An RPM has not been released since with addition of the interrupt + extension it is no longer platform/architecture independent. The + distutils make it easy to build and install from the .tar.gz + distribution. Certainly it's just as easy as installing the rpm. + + On Mac OS X, /usr/bin/python may be pointing at the OS-installed python, which does not have GUI support. Change the first line of /usr/bin/idle to read: + #! /usr/bin/env pythonw Also, to build an IDLE application that can be used from the Finder on Mac OS X, run: + pythonw buildapp.py build open build + You will see an IDLE application. + -See README.txt for more details on this version of IDLEfork. +See README.txt and NEWS.txt for more details on this version of IDLEfork. diff --git a/Lib/idlelib/LICENSE.txt b/Lib/idlelib/LICENSE.txt index f7a8395..5d28644 100644 --- a/Lib/idlelib/LICENSE.txt +++ b/Lib/idlelib/LICENSE.txt @@ -1,39 +1,40 @@ To apply this license to IDLE or IDLEfork, read 'IDLE' or 'IDLEfork' -for every occurence of 'Python 2.1.1' in the text below. +for every occurence of 'Python 2.3' in the text below. -PSF LICENSE AGREEMENT ---------------------- +PSF LICENSE AGREEMENT FOR PYTHON 2.3 +------------------------------------ 1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and the Individual or Organization ("Licensee") accessing and -otherwise using Python 2.1.1 software in source or binary form and its +otherwise using Python 2.3 software in source or binary form and its associated documentation. 2. Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, -prepare derivative works, distribute, and otherwise use Python 2.1.1 +prepare derivative works, distribute, and otherwise use Python 2.3 alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c) -2001 Python Software Foundation; All Rights Reserved" are retained in -Python 2.1.1 alone or in any derivative version prepared by Licensee. +2001, 2002, 2003 Python Software Foundation; All Rights Reserved" are +retained in Python 2.3 alone or in any derivative version prepared by +Licensee. 3. In the event Licensee prepares a derivative work that is based on -or incorporates Python 2.1.1 or any part thereof, and wants to make +or incorporates Python 2.3 or any part thereof, and wants to make the derivative work available to others as provided herein, then Licensee hereby agrees to include in any such work a brief summary of -the changes made to Python 2.1.1. +the changes made to Python 2.3. -4. PSF is making Python 2.1.1 available to Licensee on an "AS IS" +4. PSF is making Python 2.3 available to Licensee on an "AS IS" basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.1.1 WILL NOT +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.3 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON -2.1.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS -A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.1.1, +2.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS +A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.3, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. 6. This License Agreement will automatically terminate upon a material @@ -45,6 +46,6 @@ Licensee. This License Agreement does not grant permission to use PSF trademarks or trade name in a trademark sense to endorse or promote products or services of Licensee, or any third party. -8. By copying, installing or otherwise using Python 2.1.1, Licensee +8. By copying, installing or otherwise using Python 2.3, Licensee agrees to be bound by the terms and conditions of this License Agreement. diff --git a/Lib/idlelib/aboutDialog.py b/Lib/idlelib/aboutDialog.py index 2fc4a42..36c520f 100644 --- a/Lib/idlelib/aboutDialog.py +++ b/Lib/idlelib/aboutDialog.py @@ -60,11 +60,11 @@ class AboutDialog(Toplevel): justify=LEFT,fg=self.fg,bg=self.bg) labelDesc.grid(row=2,column=0,sticky=W,columnspan=3,padx=10,pady=5) labelCopyright = Label(frameBg, - text="Copyright (c) 2001 Python Software Foundation;\nAll Rights Reserved", + text="Copyright (c) 2001 - 2003 Python Software Foundation\nAll Rights Reserved", justify=LEFT,fg=self.fg,bg=self.bg) labelCopyright.grid(row=3,column=0,sticky=W,columnspan=3,padx=10,pady=5) labelLicense = Label(frameBg, - text='Released under the Python 2.1.1 PSF Licence', + text='Released under the Python 2.3 PSF License', justify=LEFT,fg=self.fg,bg=self.bg) labelLicense.grid(row=4,column=0,sticky=W,columnspan=3,padx=10,pady=5) Frame(frameBg,height=5,bg=self.bg).grid(row=5,column=0) diff --git a/Lib/idlelib/setup.py b/Lib/idlelib/setup.py index a7cff9c..f854628 100644 --- a/Lib/idlelib/setup.py +++ b/Lib/idlelib/setup.py @@ -104,6 +104,8 @@ David Scherer at CMU as part of VPython. It features execution in a separate process which is newly initiated for each run. At version 0.9 the RPC was changed to incorporate code by GvR, which supports the debugger. IDLEfork also incorporates a GUI configuration utilility. +It is written in almost pure Python :-P + For further details, refer to idlefork.sourceforge.net. """, |