Commit f9b95d4d authored by Neal Norwitz's avatar Neal Norwitz

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

parent e6568694
...@@ -21,7 +21,6 @@ files: the pack stuff from aepack, the objects from aetypes. ...@@ -21,7 +21,6 @@ files: the pack stuff from aepack, the objects from aetypes.
""" """
from types import *
from Carbon import AE from Carbon import AE
from Carbon import Evt from Carbon import Evt
from Carbon import AppleEvents from Carbon import AppleEvents
...@@ -167,11 +166,11 @@ class TalkTo: ...@@ -167,11 +166,11 @@ class TalkTo:
self.target_signature = None self.target_signature = None
if signature is None: if signature is None:
signature = self._signature signature = self._signature
if type(signature) == AEDescType: if isinstance(signature, AEDescType):
self.target = signature self.target = signature
elif hasattr(signature, '__aepack__'): elif hasattr(signature, '__aepack__'):
self.target = 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 = AE.AECreateDesc(AppleEvents.typeApplSignature, signature)
self.target_signature = signature self.target_signature = signature
else: else:
......
...@@ -524,6 +524,7 @@ Steve Purcell ...@@ -524,6 +524,7 @@ Steve Purcell
Brian Quinlan Brian Quinlan
Anders Qvist Anders Qvist
Burton Radons Burton Radons
Antti Rasinen
Eric Raymond Eric Raymond
Edward K. Ream Edward K. Ream
Marc Recht Marc Recht
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment