Weaklink most toolbox modules, improving backward compatibility. Modules will no...

Should finally fix 531398. 2.2.1 candidate.

diff --git a/Mac/Modules/ae/aesupport.py b/Mac/Modules/ae/aesupport.py
index 216185794ecae888b09a6f0325021c313e3f8ae0..8ecaeda3cb97de2acc80f24abc8821a8067775d5 100644 (file)
--- a/Mac/Modules/ae/aesupport.py
+++ b/Mac/Modules/ae/aesupport.py
@@ -77,8 +77,8 @@ AEEventHandlerUPP = EventHandlerProcPtr
 AlwaysFalse = FakeType("0")
 
 
-AEFunction = OSErrFunctionGenerator
-AEMethod = OSErrMethodGenerator
+AEFunction = OSErrWeakLinkFunctionGenerator
+AEMethod = OSErrWeakLinkMethodGenerator
 
 
 includestuff = includestuff + """

diff --git a/Mac/Modules/cm/cmsupport.py b/Mac/Modules/cm/cmsupport.py
index 6511a3cd579e601b64d58dd049080990fb0363ac..0cf7fa118a1e957a93e99c7892bb66dc158c2616 100644 (file)
--- a/Mac/Modules/cm/cmsupport.py
+++ b/Mac/Modules/cm/cmsupport.py
@@ -109,8 +109,8 @@ module.addobject(ci_object)
 module.addobject(c_object)
 
 # Create the generator classes used to populate the lists
-Function = OSErrFunctionGenerator
-Method = OSErrMethodGenerator
+Function = OSErrWeakLinkFunctionGenerator
+Method = OSErrWeakLinkMethodGenerator
 
 # Create and populate the lists
 functions = []

diff --git a/Mac/Modules/drag/dragsupport.py b/Mac/Modules/drag/dragsupport.py
index 3fcc2ab2ff7e20fc4cd9de37ecf5abc369f9a908..1eaa28e0a29332eaf69d8900c631649f006ababe 100644 (file)
--- a/Mac/Modules/drag/dragsupport.py
+++ b/Mac/Modules/drag/dragsupport.py
@@ -214,8 +214,8 @@ object = MyObjectDefinition(OBJECTNAME, OBJECTPREFIX, OBJECTTYPE)
 module.addobject(object)
 
 # Create the generator classes used to populate the lists
-Function = OSErrFunctionGenerator
-Method = OSErrMethodGenerator
+Function = OSErrWeakLinkFunctionGenerator
+Method = OSErrWeakLinkMethodGenerator
 
 # Create and populate the lists
 functions = []

diff --git a/Mac/Modules/evt/evtsupport.py b/Mac/Modules/evt/evtsupport.py
index d09403a0856ee6212982feda99e369d71fa9f14d..c05a3ed200dc47ba3c7465eef8d33cfedc4f19e7 100644 (file)
--- a/Mac/Modules/evt/evtsupport.py
+++ b/Mac/Modules/evt/evtsupport.py
@@ -64,8 +64,8 @@ module = MacModule(MODNAME, MODPREFIX, includestuff, finalstuff, initstuff)
 ##module.addobject(object)
 
 # Create the generator classes used to populate the lists
-Function = OSErrFunctionGenerator
-##Method = OSErrMethodGenerator
+Function = OSErrWeakLinkFunctionGenerator
+##Method = OSErrWeakLinkMethodGenerator
 
 # Create and populate the lists
 functions = []

diff --git a/Mac/Modules/fm/fmsupport.py b/Mac/Modules/fm/fmsupport.py
index 10d3fce801f534688166f257f65102a071bde6e6..20ae292354574d74f0b6cdc757282cf6482856e7 100644 (file)
--- a/Mac/Modules/fm/fmsupport.py
+++ b/Mac/Modules/fm/fmsupport.py
@@ -70,7 +70,7 @@ FMetricRecPtr = OpaqueType('FMetricRec', 'FMRec')
 module = MacModule(MODNAME, MODPREFIX, includestuff, finalstuff, initstuff)
 
 # Create the generator classes used to populate the lists
-Function = OSErrFunctionGenerator
+Function = OSErrWeakLinkFunctionGenerator
 
 # Create and populate the lists
 functions = []

diff --git a/Mac/Modules/icn/icnsupport.py b/Mac/Modules/icn/icnsupport.py
index 52d075d8cf5e56c7945d7990c27ce446206951f4..242428e581d5bb898e1144c042e2347b1cc04c86 100644 (file)
--- a/Mac/Modules/icn/icnsupport.py
+++ b/Mac/Modules/icn/icnsupport.py
@@ -75,7 +75,7 @@ module = MacModule(MODNAME, MODPREFIX, includestuff, finalstuff, initstuff)
 ##module.addobject(object)
 
 # Create the generator classes used to populate the lists
-Function = OSErrFunctionGenerator
+Function = OSErrWeakLinkFunctionGenerator
 ##Method = OSErrMethodGenerator
 
 # Create and populate the lists

diff --git a/Mac/Modules/qd/qdsupport.py b/Mac/Modules/qd/qdsupport.py
index 561aefded6873ee5564ea3a2ef073d42570f6547..b19533a3c4596941d3969d5815bfce7740092913 100644 (file)
--- a/Mac/Modules/qd/qdsupport.py
+++ b/Mac/Modules/qd/qdsupport.py
@@ -548,8 +548,8 @@ module.addobject(qd_object)
 
 
 # Create the generator classes used to populate the lists
-Function = OSErrFunctionGenerator
-Method = OSErrMethodGenerator
+Function = OSErrWeakLinkFunctionGenerator
+Method = OSErrWeakLinkMethodGenerator
 
 # Create and populate the lists
 functions = []

diff --git a/Mac/Modules/qdoffs/qdoffssupport.py b/Mac/Modules/qdoffs/qdoffssupport.py
index 3e0337e143d438b6b41f69ec446c6ff2767864e2..057f0a96ce365b9cd2d9e827842a82b7e8e459e3 100644 (file)
--- a/Mac/Modules/qdoffs/qdoffssupport.py
+++ b/Mac/Modules/qdoffs/qdoffssupport.py
@@ -83,8 +83,8 @@ module.addobject(object)
 
 
 # Create the generator classes used to populate the lists
-Function = OSErrFunctionGenerator
-Method = OSErrMethodGenerator
+Function = OSErrWeakLinkFunctionGenerator
+Method = OSErrWeakLinkMethodGenerator
 
 # Create and populate the lists
 functions = []

diff --git a/Mac/Modules/qt/qtsupport.py b/Mac/Modules/qt/qtsupport.py
index 2d66327b2a589f8307170f8ac2277d6aa756ffd6..c6525c08941b61a9a068d4ac292ab8f2ad053fb8 100644 (file)
--- a/Mac/Modules/qt/qtsupport.py
+++ b/Mac/Modules/qt/qtsupport.py
@@ -254,8 +254,8 @@ module.addobject(Track_object)
 module.addobject(Movie_object)
 
 # Create the generator classes used to populate the lists
-Function = OSErrFunctionGenerator
-Method = OSErrMethodGenerator
+Function = OSErrWeakLinkFunctionGenerator
+Method = OSErrWeakLinkMethodGenerator
 
 # Create and populate the lists
 functions = []

diff --git a/Mac/Modules/te/tesupport.py b/Mac/Modules/te/tesupport.py
index 6aa5a659be277f4f0d391df2c82dac094439733f..a77250c6569048dc951efda736fe9a4f6f38ec62 100644 (file)
--- a/Mac/Modules/te/tesupport.py
+++ b/Mac/Modules/te/tesupport.py
@@ -79,7 +79,7 @@ initstuff = initstuff + """
        PyMac_INIT_TOOLBOX_OBJECT_CONVERT(TEHandle, TEObj_Convert);
 """
 
-class TEMethodGenerator(OSErrMethodGenerator):
+class TEMethodGenerator(OSErrWeakLinkMethodGenerator):
        """Similar to MethodGenerator, but has self as last argument"""
 
        def parseArgumentList(self, args):
@@ -150,7 +150,7 @@ object = MyObjectDefinition(OBJECTNAME, OBJECTPREFIX, OBJECTTYPE)
 module.addobject(object)
 
 # Create the generator classes used to populate the lists
-Function = OSErrFunctionGenerator
+Function = OSErrWeakLinkFunctionGenerator
 Method = TEMethodGenerator
 
 # Create and populate the lists