blob: 85f32cd455d4cadc9f68b6480f40b4915495a55a [file] [log] [blame]
Kurt B. Kaiserd65ca722001-07-16 07:08:20 +00001? coexist.diff
2? fidle
3? build
4? install.kbk
5? coexist.patch
6Index: PyShell.py
7===================================================================
8RCS file: /cvsroot/idlefork/idle/PyShell.py,v
9retrieving revision 1.6
10diff -c -r1.6 PyShell.py
11*** PyShell.py 2001/07/16 05:25:12 1.6
12--- PyShell.py 2001/07/16 05:53:22
13***************
14*** 470,476 ****
15
16 def begin(self):
17 self.resetoutput()
18! self.write("Python %s on %s\n%s\nIDLE Fork %s -- press F1 for help\n" %
19 (sys.version, sys.platform, self.COPYRIGHT,
20 idlever.IDLE_VERSION))
21 try:
22--- 470,476 ----
23
24 def begin(self):
25 self.resetoutput()
26! self.write("Python %s on %s\n%s\nFIDLE Fork %s -- press F1 for help\n" %
27 (sys.version, sys.platform, self.COPYRIGHT,
28 idlever.IDLE_VERSION))
29 try:
30Index: setup.py
31===================================================================
32RCS file: /cvsroot/idlefork/idle/setup.py,v
33retrieving revision 1.4
34diff -c -r1.4 setup.py
35*** setup.py 2001/07/16 04:00:10 1.4
36--- setup.py 2001/07/16 05:53:22
37***************
38*** 5,11 ****
39 import idlever
40
41 # name of idle package
42! idlelib = "idlelib"
43
44 # the normal build_py would not incorporate the .txt files
45 txt_files = ['config-unix.txt','config-win.txt','config.txt', 'help.txt']
46--- 5,11 ----
47 import idlever
48
49 # name of idle package
50! idlelib = "fidlelib"
51
52 # the normal build_py would not incorporate the .txt files
53 txt_files = ['config-unix.txt','config-win.txt','config.txt', 'help.txt']
54***************
55*** 55,69 ****
56
57 # Arghhh. install_lib thinks that all files returned from build_py's
58 # get_outputs are bytecode files
59 class idle_install_lib(install_lib):
60 def _bytecode_filenames(self, files):
61 files = [n for n in files if n.endswith('.py')]
62 return install_lib._bytecode_filenames(self,files)
63-
64
65! setup(name="IDLE",
66 version = idlever.IDLE_VERSION,
67! description = "IDLE, the Python IDE",
68 author = "Guido van Rossum",
69 author_email = "guido@python.org",
70 #url =
71--- 55,69 ----
72
73 # Arghhh. install_lib thinks that all files returned from build_py's
74 # get_outputs are bytecode files
75+
76 class idle_install_lib(install_lib):
77 def _bytecode_filenames(self, files):
78 files = [n for n in files if n.endswith('.py')]
79 return install_lib._bytecode_filenames(self,files)
80
81! setup(name="FIDLE",
82 version = idlever.IDLE_VERSION,
83! description = "FIDLE, the Forked Python IDE",
84 author = "Guido van Rossum",
85 author_email = "guido@python.org",
86 #url =
87***************
88*** 71,81 ****
89 """IDLE is a Tkinter based IDE for Python. It is written in 100% pure
90 Python and works both on Windows and Unix. It features a multi-window
91 text editor with multiple undo, Python colorizing, and many other things,
92! as well as a Python shell window and a debugger.""",
93
94 cmdclass = {'build_py':idle_build_py,
95 'install_lib':idle_install_lib},
96 package_dir = {idlelib:'.'},
97 packages = [idlelib],
98! scripts = ['idle', 'idles']
99 )
100--- 71,86 ----
101 """IDLE is a Tkinter based IDE for Python. It is written in 100% pure
102 Python and works both on Windows and Unix. It features a multi-window
103 text editor with multiple undo, Python colorizing, and many other things,
104! as well as a Python shell window and a debugger.
105!
106! FIDLE is a separate line of development which was initiated by D. Scherer
107! at CMU as part of Visual Python. It features execution in a separate
108! process, with a fresh environment for each run. For further details,
109! refer to idlefork.sourceforge.net.""",
110
111 cmdclass = {'build_py':idle_build_py,
112 'install_lib':idle_install_lib},
113 package_dir = {idlelib:'.'},
114 packages = [idlelib],
115! scripts = ['fidle', 'fidles']
116 )
117*** /dev/null Tue May 5 16:32:27 1998
118--- fidle Sat Jul 14 12:40:25 2001
119***************
120*** 0 ****
121--- 1,12 ----
122+ #! /usr/bin/env python
123+
124+ import os
125+ import sys
126+ from fidlelib import IdleConf
127+
128+ idle_dir = os.path.dirname(IdleConf.__file__)
129+ IdleConf.load(idle_dir)
130+
131+ # defer importing Pyshell until IdleConf is loaded
132+ from fidlelib import PyShell
133+ PyShell.main()
134*** idle Sat Jul 14 12:40:36 2001
135--- /dev/null Tue May 5 16:32:27 1998
136***************
137*** 1,12 ****
138- #! /usr/bin/env python
139-
140- import os
141- import sys
142- from idlelib import IdleConf
143-
144- idle_dir = os.path.dirname(IdleConf.__file__)
145- IdleConf.load(idle_dir)
146-
147- # defer importing Pyshell until IdleConf is loaded
148- from idlelib import PyShell
149- PyShell.main()
150--- 0 ----
151*** /dev/null Tue May 5 16:32:27 1998
152--- fidles Mon Jul 16 02:25:48 2001
153***************
154*** 0 ****
155--- 1,13 ----
156+ #! /usr/bin/env python
157+
158+ import os
159+ import sys
160+ from fidlelib import IdleConf
161+
162+ idle_dir = os.path.dirname(IdleConf.__file__)
163+ IdleConf.load(idle_dir)
164+
165+ # defer importing Pyshell until IdleConf is loaded
166+ from fidlelib import PyShell
167+ # open a shell instead of an editor window
168+ PyShell.main(0)
169*** idles Mon Jul 16 02:27:23 2001
170--- /dev/null Tue May 5 16:32:27 1998
171***************
172*** 1,13 ****
173- #! /usr/bin/env python
174-
175- import os
176- import sys
177- from idlelib import IdleConf
178-
179- idle_dir = os.path.dirname(IdleConf.__file__)
180- IdleConf.load(idle_dir)
181-
182- # defer importing Pyshell until IdleConf is loaded
183- from idlelib import PyShell
184- # open a shell instead of an editor window
185- PyShell.main(0)
186--- 0 ----