Weaklink most toolbox modules, improving backward compatibility. Modules will no longer fail to load if a single routine is missing on the curent OS version, in stead calling the missing routine will raise an exception.
Should finally fix 531398. 2.2.1 candidate.
This commit is contained in:
parent
cddc1a0249
commit
714d7268d5
|
@ -77,8 +77,8 @@ AEEventHandlerUPP = EventHandlerProcPtr
|
|||
AlwaysFalse = FakeType("0")
|
||||
|
||||
|
||||
AEFunction = OSErrFunctionGenerator
|
||||
AEMethod = OSErrMethodGenerator
|
||||
AEFunction = OSErrWeakLinkFunctionGenerator
|
||||
AEMethod = OSErrWeakLinkMethodGenerator
|
||||
|
||||
|
||||
includestuff = includestuff + """
|
||||
|
|
|
@ -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 = []
|
||||
|
|
|
@ -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 = []
|
||||
|
|
|
@ -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 = []
|
||||
|
|
|
@ -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 = []
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 = []
|
||||
|
|
|
@ -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 = []
|
||||
|
|
|
@ -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 = []
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue