From: Jack Jansen Date: Fri, 9 Feb 2001 15:56:19 +0000 (+0000) Subject: Get rid of from ... import * X-Git-Tag: v2.1b1~443 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=def0d8da5a75dddad61071de93ee72e5d4d57a7b;p=python Get rid of from ... import * --- diff --git a/Mac/Lib/Audio_mac.py b/Mac/Lib/Audio_mac.py index d59119d7e4..14f825e0ec 100644 --- a/Mac/Lib/Audio_mac.py +++ b/Mac/Lib/Audio_mac.py @@ -40,7 +40,7 @@ class Play_Audio_mac: def writeframes(self, data): import time - from Sound import * + from Sound import bufferCmd, callBackCmd, extSH import struct import MacOS if not self._chan: diff --git a/Mac/Tools/IDE/Splash.py b/Mac/Tools/IDE/Splash.py index b71e0caa21..0ce879af93 100644 --- a/Mac/Tools/IDE/Splash.py +++ b/Mac/Tools/IDE/Splash.py @@ -123,7 +123,7 @@ UpdateSplash(1) def wait(): import Evt - from Events import * + import Events global splash try: splash @@ -133,16 +133,16 @@ def wait(): time = Evt.TickCount() whattext = 0 while _keepsplashscreenopen: - ok, event = Evt.EventAvail(highLevelEventMask) + ok, event = Evt.EventAvail(Events.highLevelEventMask) if ok: # got apple event, back to mainloop break - ok, event = Evt.EventAvail(mDownMask | keyDownMask | updateMask) + ok, event = Evt.EventAvail(Events.mDownMask | Events.keyDownMask | Events.updateMask) if ok: - ok, event = Evt.WaitNextEvent(mDownMask | keyDownMask | updateMask, 30) + ok, event = Evt.WaitNextEvent(Events.mDownMask | Events.keyDownMask | Events.updateMask, 30) if ok: (what, message, when, where, modifiers) = event - if what == updateEvt: + if what == Events.updateEvt: if Win.WhichWindow(message) == splash: UpdateSplash(1, whattext) else: