mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 03:22:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Mod to previous checkin: we must require ascii, not system defautl encoding,

Browse source 
because we have no easy way to convert the python encoding string to
a CF encoding parameter.
This commit is contained in:
Jack Jansen 2003-03-03 13:19:44 +00:00
parent d505cab5b3
commit 885d4f6577
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mac/Modules/cf/cfsupport.py
View file

@ -360,7 +360,7 @@ class CFStringRefObjectDefinition(MyGlobalObjectDefinition):
if (v == Py_None) { *p_itself = NULL; return 1; } if (v == Py_None) { *p_itself = NULL; return 1; }
if (PyString_Check(v)) { if (PyString_Check(v)) {
char *cStr; char *cStr;
if (!PyArg_Parse(v, "et", "ascii", &cStr)) if (!PyArg_Parse(v, "es", "ascii", &cStr))
return NULL; return NULL;
*p_itself = CFStringCreateWithCString((CFAllocatorRef)NULL, cStr, kCFStringEncodingASCII); *p_itself = CFStringCreateWithCString((CFAllocatorRef)NULL, cStr, kCFStringEncodingASCII);
return 1; return 1;

2
Mac/Modules/cf/pycfbridge.c
View file

@ -292,7 +292,7 @@ PyCF_Python2CF_string(PyObject *src, CFStringRef *dst) {
UniChar *unichars; UniChar *unichars;
if (PyString_Check(src)) { 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 */ return NULL; /* This error is more descriptive than the general one below */
*dst = CFStringCreateWithCString((CFAllocatorRef)NULL, chars, kCFStringEncodingASCII); *dst = CFStringCreateWithCString((CFAllocatorRef)NULL, chars, kCFStringEncodingASCII);
return 1; return 1;