From 885d4f65776b650e51301ac4cb3138fa08c82cda Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Mon, 3 Mar 2003 13:19:44 +0000
Subject: [PATCH] Mod to previous checkin: we must require ascii, not system
 defautl encoding, because we have no easy way to convert the python encoding
 string to a CF encoding parameter.

---
 Mac/Modules/cf/cfsupport.py | 2 +-
 Mac/Modules/cf/pycfbridge.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Mac/Modules/cf/cfsupport.py b/Mac/Modules/cf/cfsupport.py
index bb0ac40483f..e8fb710310e 100644
--- a/Mac/Modules/cf/cfsupport.py
+++ b/Mac/Modules/cf/cfsupport.py
@@ -360,7 +360,7 @@ class CFStringRefObjectDefinition(MyGlobalObjectDefinition):
 		if (v == Py_None) { *p_itself = NULL; return 1; }
 		if (PyString_Check(v)) {
 		    char *cStr;
-		    if (!PyArg_Parse(v, "et", "ascii", &cStr))
+		    if (!PyArg_Parse(v, "es", "ascii", &cStr))
 		    	return NULL;
 			*p_itself = CFStringCreateWithCString((CFAllocatorRef)NULL, cStr, kCFStringEncodingASCII);
 			return 1;
diff --git a/Mac/Modules/cf/pycfbridge.c b/Mac/Modules/cf/pycfbridge.c
index d4466aca108..21a952262c4 100644
--- a/Mac/Modules/cf/pycfbridge.c
+++ b/Mac/Modules/cf/pycfbridge.c
@@ -292,7 +292,7 @@ PyCF_Python2CF_string(PyObject *src, CFStringRef *dst) {
 	UniChar *unichars;
 	
 	if (PyString_Check(src)) {
-		if (!PyArg_Parse(src, "es", NULL, &chars))
+		if (!PyArg_Parse(src, "es", "ascii", &chars))
 			return NULL; /* This error is more descriptive than the general one below */
 		*dst = CFStringCreateWithCString((CFAllocatorRef)NULL, chars, kCFStringEncodingASCII);
 		return 1;