Get rid of from ... import *

diff --git a/Mac/Lib/Audio_mac.py b/Mac/Lib/Audio_mac.py
index d59119d7e485d9553ac2508c410c06447b1b119c..14f825e0ecc6ab75e9a9859c63312caaff32a9f3 100644 (file)
--- 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 b71e0caa210a23f3678d20b6818238327d56ef5d..0ce879af930c763b9ee4c2b2cccede4a444643fb 100644 (file)
--- 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: