summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2007-08-07 05:42:45 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2007-08-07 05:42:45 (GMT)
commitf9b95d4dda8ced9e1179ff54757ff27bb6abd6f3 (patch)
tree2c328c8164aa0d81b60bac25a1256da72507f835
parente6568694bbf4702216292588e6438b30ea0b0f61 (diff)
downloadcpython-f9b95d4dda8ced9e1179ff54757ff27bb6abd6f3.zip
cpython-f9b95d4dda8ced9e1179ff54757ff27bb6abd6f3.tar.gz
cpython-f9b95d4dda8ced9e1179ff54757ff27bb6abd6f3.tar.bz2
Patch #1768976, Fix for failing test_scriptpackages (untested but looks good)
-rw-r--r--Lib/plat-mac/aetools.py5
-rw-r--r--Misc/ACKS1
2 files changed, 3 insertions, 3 deletions
diff --git a/Lib/plat-mac/aetools.py b/Lib/plat-mac/aetools.py
index d181234..078b183 100644
--- 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 92606e3..a86f92e 100644
--- 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