Patch #1768976, Fix for failing test_scriptpackages (untested but looks good)

diff --git a/Lib/plat-mac/aetools.py b/Lib/plat-mac/aetools.py
index d1812341a815d1a12339a6c22f90269d04b3e9f5..078b1834d5a29883f2730f4d7aa5691a178e51e2 100644 (file)
--- a/Lib/plat-mac/aetools.py
+++ b/Lib/plat-mac/aetools.py
@@ -21,7 +21,6 @@ files: the pack stuff from aepack, the objects from aetypes.
 """
 
 
-from types import *
 from Carbon import AE
 from Carbon import Evt
 from Carbon import AppleEvents
@@ -167,11 +166,11 @@ class TalkTo:
         self.target_signature = None
         if signature is None:
             signature = self._signature
-        if type(signature) == AEDescType:
+        if isinstance(signature, AEDescType):
             self.target = signature
         elif hasattr(signature, '__aepack__'):
             self.target = signature.__aepack__()
-        elif type(signature) == StringType and len(signature) == 4:
+        elif isinstance(signature, str) and len(signature) == 4:
             self.target = AE.AECreateDesc(AppleEvents.typeApplSignature, signature)
             self.target_signature = signature
         else:

diff --git a/Misc/ACKS b/Misc/ACKS
index 92606e32f3c2ed06141a207c97934aecc7467cd1..a86f92e7fc0b06d3caaedb92b5fc0c61bf0d85b6 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -524,6 +524,7 @@ Steve Purcell
 Brian Quinlan
 Anders Qvist
 Burton Radons
+Antti Rasinen
 Eric Raymond
 Edward K. Ream
 Marc Recht