diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/plat-mac/aetools.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_class.py | 5 | ||||
| -rw-r--r-- | Lib/test/test_weakref.py | 3 |
3 files changed, 2 insertions, 8 deletions
diff --git a/Lib/plat-mac/aetools.py b/Lib/plat-mac/aetools.py index 3fca7a2..06a0ddc 100644 --- a/Lib/plat-mac/aetools.py +++ b/Lib/plat-mac/aetools.py @@ -169,7 +169,7 @@ class TalkTo: signature = self._signature if type(signature) == AEDescType: self.target = signature - elif type(signature) == InstanceType and hasattr(signature, '__aepack__'): + elif hasattr(signature, '__aepack__'): self.target = signature.__aepack__() elif type(signature) == StringType and len(signature) == 4: self.target = AE.AECreateDesc(AppleEvents.typeApplSignature, signature) diff --git a/Lib/test/test_class.py b/Lib/test/test_class.py index d872357..a0b3300 100644 --- a/Lib/test/test_class.py +++ b/Lib/test/test_class.py @@ -49,7 +49,6 @@ testmeths = [ ] # These need to return something other than None -# "coerce", # "hash", # "str", # "repr", @@ -65,10 +64,6 @@ testmeths = [ # "delattr", class AllTests: - def __coerce__(self, *args): - print "__coerce__:", args - return (self,) + args - def __hash__(self, *args): print "__hash__:", args return hash(id(self)) diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py index 18ab401..1f65010 100644 --- a/Lib/test/test_weakref.py +++ b/Lib/test/test_weakref.py @@ -713,8 +713,7 @@ class MappingTestCase(TestBase): # dict, objects = self.make_weak_valued_dict() for o in objects: - self.assert_(weakref.getweakrefcount(o) == 1, - "wrong number of weak references to %r!" % o) + self.assertEqual(weakref.getweakrefcount(o), 1) self.assert_(o is dict[o.arg], "wrong object returned by weak dict!") items1 = dict.items() |