Backport of 1.7:

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, inAlso blacklisted some constants with definitions that were not Python-compatible.

diff --git a/Mac/Modules/cf/cfscan.py b/Mac/Modules/cf/cfscan.py
index 3e09df4e3f38587ec10a2028253f9fdeb6c122bf..be11dba7ea721f04df8bce245c56729aeaba56eb 100644 (file)
--- a/Mac/Modules/cf/cfscan.py
+++ b/Mac/Modules/cf/cfscan.py
@@ -95,6 +95,7 @@ class MyScanner(Scanner_OSX):
                        "CFStringCreateMutableWithExternalCharactersNoCopy", # Not a clue...
                        "CFStringSetExternalCharactersNoCopy",
                        "CFStringGetCharacterAtIndex", # No format for single unichars yet.
+                       "kCFStringEncodingInvalidId", # incompatible constant declaration
                        ]
 
        def makegreylist(self):