Get rid of most of the flags (in tp_flags) that keep track of various

variations of the type struct and its attachments.  In Py3k, all type
structs have to have all fields -- no binary backwards compatibility.
Had to change the complex object to a new-style number!

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)

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))

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()