From: Jack Jansen <jack.jansen@cwi.nl>
Date: Mon, 25 Mar 2002 10:23:56 +0000 (+0000)
Subject: Backport of 1.7:
X-Git-Tag: v2.2.1c2~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c165e53066ce2ebdfe9a99919c10572b6ed5415e;p=thirdparty%2FPython%2Fcpython.git

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 3e09df4e3f38..be11dba7ea72 100644
--- 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):