traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed string and dict conversion, and implemented booleans and numbers (int and float). I think we now have enough CFType support to start on plists and CFpreferences! 

Transparent handling of unknown CFType objects still TBD.
This commit is contained in:
Jack Jansen 2002-05-08 22:13:51 +00:00
parent 1df628ddce
commit 42251323b4
1 changed files with 49 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
Mac/Modules/cf/pycfbridge.c
View File

@ -4,6 +4,7 @@
#ifdef WITHOUT_FRAMEWORKS #ifdef WITHOUT_FRAMEWORKS
#include <CFBase.h> #include <CFBase.h>
#include <CFNumber.h>
#include <CFArray.h> #include <CFArray.h>
#include <CFData.h> #include <CFData.h>
#include <CFDictionary.h> #include <CFDictionary.h>
@ -66,25 +67,30 @@ err:
PyObject * PyObject *
PyCF_CF2Python_mapping(CFTypeRef src) { PyCF_CF2Python_mapping(CFTypeRef src) {
int size = CFDictionaryGetCount(src); int size = CFDictionaryGetCount(src);
PyObject *rv; PyObject *rv = NULL;
CFTypeRef *allkeys, *allvalues; CFTypeRef *allkeys = NULL, *allvalues = NULL;
CFTypeRef key_cf, value_cf; CFTypeRef key_cf, value_cf;
PyObject *key_py = NULL, *value_py = NULL; PyObject *key_py = NULL, *value_py = NULL;
int i; int i;
allkeys = malloc(size*sizeof(CFTypeRef *)); allkeys = malloc(size*sizeof(CFTypeRef *));
if (allkeys == NULL) return PyErr_NoMemory(); if (allkeys == NULL) {
PyErr_NoMemory();
goto err;
}
allvalues = malloc(size*sizeof(CFTypeRef *)); allvalues = malloc(size*sizeof(CFTypeRef *));
if (allvalues == NULL) return PyErr_NoMemory(); if (allvalues == NULL) {
if ( (rv=PyDict_New()) == NULL ) PyErr_NoMemory();
return NULL; goto err;
}
if ( (rv=PyDict_New()) == NULL ) goto err;
CFDictionaryGetKeysAndValues(src, allkeys, allvalues); CFDictionaryGetKeysAndValues(src, allkeys, allvalues);
for(i=0; i<size; i++) { for(i=0; i<size; i++) {
key_cf = allkeys[i]; key_cf = allkeys[i];
value_cf = allvalues[i]; value_cf = allvalues[i];
key_py = PyCF_CF2Python(key_cf); key_py = PyCF_CF2Python(key_cf);
if (key_py == NULL ) goto err; if (key_py == NULL ) goto err;
value_py = PyCF_CF2Python(value_py); value_py = PyCF_CF2Python(value_cf);
if (value_py == NULL ) goto err; if (value_py == NULL ) goto err;
if (PyDict_SetItem(rv, key_py, value_py) < 0) goto err; if (PyDict_SetItem(rv, key_py, value_py) < 0) goto err;
key_py = NULL; key_py = NULL;
@ -94,7 +100,7 @@ PyCF_CF2Python_mapping(CFTypeRef src) {
err: err:
Py_XDECREF(key_py); Py_XDECREF(key_py);
Py_XDECREF(value_py); Py_XDECREF(value_py);
Py_DECREF(rv); Py_XDECREF(rv);
free(allkeys); free(allkeys);
free(allvalues); free(allvalues);
return NULL; return NULL;
@ -107,6 +113,21 @@ PyCF_CF2Python_simple(CFTypeRef src) {
typeid = CFGetTypeID(src); typeid = CFGetTypeID(src);
if (typeid == CFStringGetTypeID()) if (typeid == CFStringGetTypeID())
return PyCF_CF2Python_string((CFStringRef)src); return PyCF_CF2Python_string((CFStringRef)src);
if (typeid == CFBooleanGetTypeID())
return PyBool_FromLong((long)CFBooleanGetValue(src));
if (typeid == CFNumberGetTypeID()) {
if (CFNumberIsFloatType(src)) {
double d;
CFNumberGetValue(src, kCFNumberDoubleType, &d);
return PyFloat_FromDouble(d);
} else {
long l;
if (!CFNumberGetValue(src, kCFNumberLongType, &l))
/* XXXX Out of range! */;
return PyInt_FromLong(l);
}
}
/* XXXX Should return as CFTypeRef, really... */
PyMac_Error(resNotFound); PyMac_Error(resNotFound);
return NULL; return NULL;
} }
@ -123,7 +144,7 @@ PyCF_CF2Python_string(CFStringRef src) {
range.length = size; range.length = size;
if( data == NULL ) return PyErr_NoMemory(); if( data == NULL ) return PyErr_NoMemory();
CFStringGetCharacters(src, range, data); CFStringGetCharacters(src, range, data);
rv = (PyObject *)PyUnicode_FromUnicode(data, size); rv = (PyObject *)PyUnicode_FromUnicode(data, size-1);
free(data); free(data);
return rv; return rv;
} }
@ -197,11 +218,9 @@ PyCF_Python2CF_mapping(PyObject *src, CFDictionaryRef *dst) {
for( i=0; i<size; i++) { for( i=0; i<size; i++) {
item_py = PySequence_GetItem(aslist, i); item_py = PySequence_GetItem(aslist, i);
if (item_py == NULL) goto err; if (item_py == NULL) goto err;
if (!PyArg_ParseTuple(item_py, "OO", key_py, value_py)) goto err; if (!PyArg_ParseTuple(item_py, "OO", &key_py, &value_py)) goto err;
if ( !PyCF_Python2CF(key_py, &key_cf) ) goto err; if ( !PyCF_Python2CF(key_py, &key_cf) ) goto err;
Py_DECREF(key_py);
if ( !PyCF_Python2CF(value_py, &value_cf) ) goto err; if ( !PyCF_Python2CF(value_py, &value_cf) ) goto err;
Py_DECREF(value_py);
CFDictionaryAddValue(rv, key_cf, value_cf); CFDictionaryAddValue(rv, key_cf, value_cf);
CFRelease(key_cf); CFRelease(key_cf);
key_cf = NULL; key_cf = NULL;
@ -212,8 +231,6 @@ PyCF_Python2CF_mapping(PyObject *src, CFDictionaryRef *dst) {
return 1; return 1;
err: err:
Py_XDECREF(item_py); Py_XDECREF(item_py);
Py_XDECREF(key_py);
Py_XDECREF(value_py);
Py_XDECREF(aslist); Py_XDECREF(aslist);
if (rv) CFRelease(rv); if (rv) CFRelease(rv);
if (key_cf) CFRelease(key_cf); if (key_cf) CFRelease(key_cf);
@ -230,6 +247,24 @@ PyCF_Python2CF_simple(PyObject *src, CFTypeRef *dst) {
} }
if (PyString_Check(src) || PyUnicode_Check(src)) if (PyString_Check(src) || PyUnicode_Check(src))
return PyCF_Python2CF_string(src, (CFStringRef *)dst); return PyCF_Python2CF_string(src, (CFStringRef *)dst);
if (PyBool_Check(src)) {
if (src == Py_True)
*dst = kCFBooleanTrue;
else
*dst = kCFBooleanFalse;
return 1;
}
if (PyInt_Check(src)) {
long v = PyInt_AsLong(src);
*dst = CFNumberCreate(NULL, kCFNumberLongType, &v);
return 1;
}
if (PyFloat_Check(src)) {
double d = PyFloat_AsDouble(src);
*dst = CFNumberCreate(NULL, kCFNumberDoubleType, &d);
return 1;
}
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"Cannot convert %.500s objects to CF", "Cannot convert %.500s objects to CF",
src->ob_type->tp_name); src->ob_type->tp_name);