removed import display hackery

This commit is contained in:
Just van Rossum 2001-11-02 19:30:21 +00:00
parent f7f9388061
commit 2d564fdc06
2 changed files with 5 additions and 66 deletions

View File

@ -1,4 +1,4 @@
# copyright 1997-2000 Just van Rossum, Letterror. just@letterror.com # copyright 1997-2001 Just van Rossum, Letterror. just@letterror.com
import Splash import Splash
@ -29,7 +29,6 @@ class PythonIDE(Wapplication.Application):
self.quitevent) self.quitevent)
import PyConsole, PyEdit import PyConsole, PyEdit
Splash.wait() Splash.wait()
Splash.uninstall_importhook()
PyConsole.installoutput() PyConsole.installoutput()
PyConsole.installconsole() PyConsole.installconsole()
import sys import sys

View File

@ -5,77 +5,17 @@ splash = Dlg.GetNewDialog(468, -1)
splash.DrawDialog() splash.DrawDialog()
from Carbon import Qd, TE, Fm from Carbon import Qd, TE, Fm
import sys
_real__import__ = None
def install_importhook():
global _real__import__
import __builtin__
if _real__import__ is None:
_real__import__ = __builtin__.__import__
__builtin__.__import__ = my__import__
def uninstall_importhook():
global _real__import__
if _real__import__ is not None:
import __builtin__
__builtin__.__import__ = _real__import__
_real__import__ = None
_progress = 0
_about_width = 440
_about_height = 340
def importing(module):
global _progress
Qd.SetPort(splash)
fontID = Fm.GetFNum("Python-Sans")
if not fontID:
from Carbon.Fonts import geneva
fontID = geneva
Qd.TextFont(fontID)
Qd.TextSize(9)
labelrect = (35, _about_height - 35, _about_width - 35, _about_height - 19)
framerect = (35, _about_height - 19, _about_width - 35, _about_height - 11)
l, t, r, b = progrect = Qd.InsetRect(framerect, 1, 1)
if module:
TE.TETextBox('Importing: ' + module, labelrect, 0)
if not _progress:
Qd.FrameRect(framerect)
pos = min(r, l + ((r - l) * _progress) / 44)
Qd.PaintRect((l, t, pos, b))
_progress = _progress + 1
else:
Qd.EraseRect(labelrect)
Qd.PaintRect((l, t, pos, b))
Qd.QDFlushPortBuffer(splash.GetDialogWindow().GetWindowPort(), None)
def my__import__(name, globals=None, locals=None, fromlist=None):
try:
return sys.modules[name]
except KeyError:
try:
importing(name)
except:
try:
rv = _real__import__(name)
finally:
uninstall_importhook()
return rv
return _real__import__(name)
#install_importhook()
kHighLevelEvent = 23
from Carbon import Win from Carbon import Win
from Carbon.Fonts import * from Carbon.Fonts import *
from Carbon.QuickDraw import * from Carbon.QuickDraw import *
from Carbon.TextEdit import * from Carbon.TextEdit import teJustCenter
import string import string
import sys import sys
_about_width = 440
_about_height = 340
_keepsplashscreenopen = 0 _keepsplashscreenopen = 0
abouttext1 = """The Python Integrated Development Environment for the Macintosh\xaa abouttext1 = """The Python Integrated Development Environment for the Macintosh\xaa