Skip to content

Commit e394ef8

Browse files
committed
Update for release
Modified Files: CREDITS.txt INSTALL.txt LICENSE.txt aboutDialog.py setup.py
1 parent 84f8ecd commit e394ef8

File tree

5 files changed

+78
-45
lines changed

5 files changed

+78
-45
lines changed

Lib/idlelib/CREDITS.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ Other contributors include Raymond Hettinger, Tony Lownds (Mac integration),
2020
Neal Norwitz (code check and clean-up), and Chui Tey (RPC integration, debugger
2121
integration and persistent breakpoints).
2222

23-
Hernan Foffani, Christos Georgiou, Martin v. Loewis, Jason Orendorff,
24-
Noam Raphael, Josh Robb, and Bruce Sherwood have submitted useful patches.
25-
Thanks, guys!
23+
Hernan Foffani, Christos Georgiou, Martin v. Loewis, Jason Orendorff, Noam
24+
Raphael, Josh Robb, Nigel Rowe, and Bruce Sherwood have submitted useful
25+
patches. Thanks, guys!
2626

2727
There are others who should be included here, especially those who contributed
2828
to IDLE versions prior to 0.8, principally Mark Hammond, Jeremy Hylton,

Lib/idlelib/INSTALL.txt

Lines changed: 56 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,55 +5,85 @@ IDLEfork requires Python Version 2.2 or later.
55

66
There are several distribution files (where xx is the subversion):
77

8-
IDLEfork-0.9xx.win32.exe
9-
This is a Windows installer which will install IDLEfork in
10-
..../site-packages/idleforklib/ and place the idefork startup script
11-
at ..../scripts/idlefork. Rename this to idlefork.pyw and
12-
point your launcher icons at it. Installation is as idlefork
13-
to avoid conflict with the original Python IDLE.
14-
15-
IDLEfork-0.9xx-1.noarch.rpm
16-
This is an rpm which is designed to install as idleforklib in an
17-
existing /usr/lib/python2.2 tree. It installs as idlefork to avoid
18-
conflict with Python IDLE.
19-
20-
Python rpms are available at http://www.python.org/2.2.2/rpms.html and
21-
http://www.python.org/2.2.1/rpms.html.
8+
IDLEfork-0.9xx.win32-py2.2.exe
9+
IDLEfork-0.9xx.win32-py2.3.exe
10+
11+
These are Windows installers which will install IDLEfork in
12+
..../site-packages/idleforklib/ and place the idefork startup script at
13+
..../scripts/idlefork. Rename this script to idlefork.pyw and point
14+
your launcher icons at it. Installation is as idlefork to avoid
15+
conflict with the original Python IDLE. Choose the installer
16+
appropriate for your version of Python.
2217

2318
IDLEfork-0.9xx.tar.gz
2419
This is a distutils sdist (source) tarfile which can be used to make
25-
installations on platforms not supported by the above files.
26-
** It remains configured to install as idlelib, not idleforklib. **
20+
installations on non-Windows platforms, or on Windows if a custom
21+
installation is desired. It installs as idlefork and will not
22+
conflict with Python IDLE.
2723

2824
Unpack in ..../Tools/, cd to the IDLEfork directory created, and
29-
"python setup.py install" to install in ....site-packages/idlelib.
30-
This will overwrite the Python IDLE installation.
25+
"python setup.py install" to install in ....site-packages/idleforklib.
26+
27+
IDLE-0.9xx.tar.gz
28+
This is also a distutils sdist (source) tarfile.
29+
30+
** It remains configured to install as idlelib, not idleforklib. **
31+
32+
First, remove your existing ..../site-packages/idlelib directory.
33+
34+
Unpack in ..../Tools/, cd to the IDLE directory (note the caps)
35+
created, and "python setup.py install" to install in
36+
....site-packages/idlelib. This will replace the Python IDLE
37+
installation.
38+
39+
If you don't want to overwrite Python IDLE, I'd recommend using the
40+
IDLEfork release mentioned above. However, it is also possible to
41+
simply build IDLE without installing it: "python setup.py build" and
42+
then copy the interrupt.so library out of the build directory into the
43+
IDLE directory where IDLE can find it,
44+
45+
In this case, IDLE will not be on your PATH unless you are in the
46+
source directory. Either append your PATH or use a fully qualified
47+
path to access IDLE, something like
48+
49+
python /usr/bin/python/Tools/IDLE/idle.py
50+
51+
That way you can continue to use the original IDLE at
52+
..../Tools/idle/idle.py if you like. (note lower case)
53+
54+
Using this approach, it's possible to have many different versions
55+
of IDLE on your system at the same time, for comparison/test.
3156

32-
If you don't want to overwrite Python IDLE, it is also possible to
33-
simply call "python idle.py" to run from the IDLEfork source directory
34-
without making an installation. In this case, IDLE will not be on
35-
your PATH unless you are in the source directory. Also, it is then
36-
advisable to remove any Python IDLE installation by removing
37-
..../site-packages/idlelib so the two identically named packages don't
38-
conflict.
3957

4058
On Redhat Linux systems prior to 8.0, /usr/bin/python may be pointing
4159
at python1.5. If so, change the first line in the /usr/bin/idle
4260
script to read:
61+
4362
!# /usr/bin/python2.2
4463

64+
65+
An RPM has not been released since with addition of the interrupt
66+
extension it is no longer platform/architecture independent. The
67+
distutils make it easy to build and install from the .tar.gz
68+
distribution. Certainly it's just as easy as installing the rpm.
69+
70+
4571
On Mac OS X, /usr/bin/python may be pointing at the OS-installed
4672
python, which does not have GUI support. Change the first line of
4773
/usr/bin/idle to read:
74+
4875
#! /usr/bin/env pythonw
4976

5077
Also, to build an IDLE application that can be used from the Finder
5178
on Mac OS X, run:
79+
5280
pythonw buildapp.py build
5381
open build
82+
5483
You will see an IDLE application.
84+
5585

56-
See README.txt for more details on this version of IDLEfork.
86+
See README.txt and NEWS.txt for more details on this version of IDLEfork.
5787

5888

5989

Lib/idlelib/LICENSE.txt

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,40 @@
11
To apply this license to IDLE or IDLEfork, read 'IDLE' or 'IDLEfork'
2-
for every occurence of 'Python 2.1.1' in the text below.
2+
for every occurence of 'Python 2.3' in the text below.
33

4-
PSF LICENSE AGREEMENT
5-
---------------------
4+
PSF LICENSE AGREEMENT FOR PYTHON 2.3
5+
------------------------------------
66

77
1. This LICENSE AGREEMENT is between the Python Software Foundation
88
("PSF"), and the Individual or Organization ("Licensee") accessing and
9-
otherwise using Python 2.1.1 software in source or binary form and its
9+
otherwise using Python 2.3 software in source or binary form and its
1010
associated documentation.
1111

1212
2. Subject to the terms and conditions of this License Agreement, PSF
1313
hereby grants Licensee a nonexclusive, royalty-free, world-wide
1414
license to reproduce, analyze, test, perform and/or display publicly,
15-
prepare derivative works, distribute, and otherwise use Python 2.1.1
15+
prepare derivative works, distribute, and otherwise use Python 2.3
1616
alone or in any derivative version, provided, however, that PSF's
1717
License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
18-
2001 Python Software Foundation; All Rights Reserved" are retained in
19-
Python 2.1.1 alone or in any derivative version prepared by Licensee.
18+
2001, 2002, 2003 Python Software Foundation; All Rights Reserved" are
19+
retained in Python 2.3 alone or in any derivative version prepared by
20+
Licensee.
2021

2122
3. In the event Licensee prepares a derivative work that is based on
22-
or incorporates Python 2.1.1 or any part thereof, and wants to make
23+
or incorporates Python 2.3 or any part thereof, and wants to make
2324
the derivative work available to others as provided herein, then
2425
Licensee hereby agrees to include in any such work a brief summary of
25-
the changes made to Python 2.1.1.
26+
the changes made to Python 2.3.
2627

27-
4. PSF is making Python 2.1.1 available to Licensee on an "AS IS"
28+
4. PSF is making Python 2.3 available to Licensee on an "AS IS"
2829
basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
2930
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
3031
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
31-
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.1.1 WILL NOT
32+
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.3 WILL NOT
3233
INFRINGE ANY THIRD PARTY RIGHTS.
3334

3435
5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
35-
2.1.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
36-
A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.1.1,
36+
2.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
37+
A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.3,
3738
OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
3839

3940
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
4546
trademarks or trade name in a trademark sense to endorse or promote
4647
products or services of Licensee, or any third party.
4748

48-
8. By copying, installing or otherwise using Python 2.1.1, Licensee
49+
8. By copying, installing or otherwise using Python 2.3, Licensee
4950
agrees to be bound by the terms and conditions of this License
5051
Agreement.

Lib/idlelib/aboutDialog.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ def CreateWidgets(self):
6060
justify=LEFT,fg=self.fg,bg=self.bg)
6161
labelDesc.grid(row=2,column=0,sticky=W,columnspan=3,padx=10,pady=5)
6262
labelCopyright = Label(frameBg,
63-
text="Copyright (c) 2001 Python Software Foundation;\nAll Rights Reserved",
63+
text="Copyright (c) 2001 - 2003 Python Software Foundation\nAll Rights Reserved",
6464
justify=LEFT,fg=self.fg,bg=self.bg)
6565
labelCopyright.grid(row=3,column=0,sticky=W,columnspan=3,padx=10,pady=5)
6666
labelLicense = Label(frameBg,
67-
text='Released under the Python 2.1.1 PSF Licence',
67+
text='Released under the Python 2.3 PSF License',
6868
justify=LEFT,fg=self.fg,bg=self.bg)
6969
labelLicense.grid(row=4,column=0,sticky=W,columnspan=3,padx=10,pady=5)
7070
Frame(frameBg,height=5,bg=self.bg).grid(row=5,column=0)

Lib/idlelib/setup.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ def _bytecode_filenames(self, files):
104104
separate process which is newly initiated for each run. At version 0.9
105105
the RPC was changed to incorporate code by GvR, which supports the
106106
debugger. IDLEfork also incorporates a GUI configuration utilility.
107+
It is written in almost pure Python :-P
108+
107109
For further details, refer to idlefork.sourceforge.net.
108110
""",
109111

0 commit comments

Comments
 (0)