Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2025-12-16 01:30:07 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update siplib to version 4.12.4

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@68904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2011-08-25 23:43:02 +00:00
parent 6733e06ff2
commit f330955043
11 changed files with 120 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sip/siplib/LICENSE
View File

@@ -12,7 +12,7 @@ hereby grants Licensee a nonexclusive, royalty-free, world-wide license to
reproduce, analyze, test, perform and/or display publicly, prepare derivative
works, distribute, and otherwise use SIP alone or in any derivative version,
provided, however, that Riverbank's License Agreement and Riverbank's notice of
copyright, e.g., "Copyright (c) 2010 Riverbank Computing Limited; All Rights
copyright, e.g., "Copyright (c) 2011 Riverbank Computing Limited; All Rights
Reserved" are retained in SIP alone or in any derivative version prepared by
Licensee.

2
sip/siplib/apiversions.c
View File

@@ -1,7 +1,7 @@
/*
* The implementation of the supprt for setting API versions.
*
* Copyright (c) 2010 Riverbank Computing Limited <info@riverbankcomputing.com>
* Copyright (c) 2011 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*

2
sip/siplib/bool.cpp
View File

@@ -1,6 +1,6 @@
// This contains all the C++ code that is needed by the sip module.
//
// Copyright (c) 2010 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2011 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of SIP.
//

2
sip/siplib/descriptors.c
View File

@@ -1,7 +1,7 @@
/*
* The implementation of the different descriptors.
*
* Copyright (c) 2010 Riverbank Computing Limited <info@riverbankcomputing.com>
* Copyright (c) 2011 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*

2
sip/siplib/objmap.c
View File

@@ -2,7 +2,7 @@
* This module implements a hash table class for mapping C/C++ addresses to the
* corresponding wrapped Python object.
*
* Copyright (c) 2010 Riverbank Computing Limited <info@riverbankcomputing.com>
* Copyright (c) 2011 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*

2
sip/siplib/qtlib.c
View File

@@ -2,7 +2,7 @@
* The SIP library code that implements the interface to the optional module
* supplied Qt support.
*
* Copyright (c) 2010 Riverbank Computing Limited <info@riverbankcomputing.com>
* Copyright (c) 2011 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*

12
sip/siplib/sip.h
View File

@@ -1,7 +1,7 @@
/*
* The SIP module interface.
*
* Copyright (c) 2010 Riverbank Computing Limited <info@riverbankcomputing.com>
* Copyright (c) 2011 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*
@@ -54,8 +54,8 @@ extern "C" {
/*
* Define the SIP version number.
*/
#define SIP_VERSION 0x040c01
#define SIP_VERSION_STR "4.12.1-snapshot-baf837919f74"
#define SIP_VERSION 0x040c04
#define SIP_VERSION_STR "4.12.4"
/*
@@ -1553,9 +1553,13 @@ typedef struct _sipQtAPI {
#define sipIsExactWrappedType(wt) (sipTypeAsPyTypeObject((wt)->type) == (PyTypeObject *)(wt))
#define sipConvertFromSliceObject(o,len,start,stop,step,slen) \
#if PY_VERSION_HEX >= 0x03020000
#define sipConvertFromSliceObject PySlice_GetIndicesEx
#else
#define sipConvertFromSliceObject(o, len, start, stop, step, slen) \
PySlice_GetIndicesEx((PySliceObject *)(o), (len), (start), (stop), \
(step), (slen))
#endif
/*

2
sip/siplib/sipint.h
View File

@@ -1,7 +1,7 @@
/*
* This file defines the SIP library internal interfaces.
*
* Copyright (c) 2010 Riverbank Computing Limited <info@riverbankcomputing.com>
* Copyright (c) 2011 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*

153
sip/siplib/siplib.c
View File

@@ -1,7 +1,7 @@
/*
* SIP library code.
*
* Copyright (c) 2010 Riverbank Computing Limited <info@riverbankcomputing.com>
* Copyright (c) 2011 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*
@@ -2478,9 +2478,9 @@ static int sip_api_parse_result(int *isErr, PyObject *method, PyObject *res,
case 'o':
{
#if defined(HAVE_LONG_LONG)
unsigned PY_LONG_LONG v = PyLong_AsUnsignedLongLong(arg);
unsigned PY_LONG_LONG v = PyLong_AsUnsignedLongLongMask(arg);
#else
unsigned long v = PyLong_AsUnsignedLong(arg);
unsigned long v = PyLong_AsUnsignedLongMask(arg);
#endif
if (PyErr_Occurred())
@@ -2767,6 +2767,12 @@ static unsigned long sip_api_long_as_unsigned_long(PyObject *o)
{
long v = PyInt_AsLong(o);
/*
* Strictly speaking this should be changed to be consistent with the
* use of PyLong_AsUnsignedLongMask(). However as it's such an old
* version of Python we choose to leave it as it is.
*/
if (v < 0)
{
PyErr_SetString(PyExc_OverflowError,
@@ -2779,7 +2785,13 @@ static unsigned long sip_api_long_as_unsigned_long(PyObject *o)
}
#endif
return PyLong_AsUnsignedLong(o);
/*
* Note that we now ignore any overflow so that (for example) a negative
* integer will be converted to an unsigned as C/C++ would do. We don't
* bother to check for overflow when converting to small C/C++ types (short
* etc.) so at least this is consistent.
*/
return PyLong_AsUnsignedLongMask(o);
}
@@ -2811,9 +2823,18 @@ static int sip_api_parse_kwd_args(PyObject **parseErrp, PyObject *sipArgs,
int ok;
va_list va;
/* Initialise the return of any unused keyword arguments. */
if (unused != NULL)
{
/* Initialise the return of any unused keyword arguments. */
*unused = NULL;
}
else if (sipKwdArgs != NULL && kwdlist == NULL)
{
/* __init__ methods avoid the normal Python checks. */
PyErr_SetString(PyExc_TypeError,
"keyword arguments are not supported");
return FALSE;
}
va_start(va, fmt);
ok = parseKwdArgs(parseErrp, sipArgs, sipKwdArgs, kwdlist, unused, fmt,
@@ -4298,9 +4319,9 @@ static int parsePass1(PyObject **parseErrp, sipSimpleWrapper **selfp,
if (arg != NULL)
{
#if defined(HAVE_LONG_LONG)
unsigned PY_LONG_LONG v = PyLong_AsUnsignedLongLong(arg);
unsigned PY_LONG_LONG v = PyLong_AsUnsignedLongLongMask(arg);
#else
unsigned long v = PyLong_AsUnsignedLong(arg);
unsigned long v = PyLong_AsUnsignedLongMask(arg);
#endif
if (PyErr_Occurred())
@@ -6755,11 +6776,11 @@ static PyObject *detail_FromFailure(PyObject *failure_obj)
{
#if PY_MAJOR_VERSION >= 3
detail = PyUnicode_FromFormat(
"keyword argument '%s' has unexpected type '%s'",
"argument '%s' has unexpected type '%s'",
failure->arg_name, Py_TYPE(failure->detail_obj)->tp_name);
#else
detail = PyString_FromFormat(
"keyword argument '%s' has unexpected type '%s'",
"argument '%s' has unexpected type '%s'",
failure->arg_name, Py_TYPE(failure->detail_obj)->tp_name);
#endif
}
@@ -7580,65 +7601,75 @@ static PyObject *sip_api_is_py_method(sip_gilstate_t *gil, char *pymc,
for (i = 0; i < PyTuple_GET_SIZE(mro); ++i)
{
PyObject *cls_dict;
PyObject *cls_dict, *cls_attr;
cls = PyTuple_GET_ITEM(mro, i);
#if PY_MAJOR_VERSION >= 3
cls_dict = ((PyTypeObject *)cls)->tp_dict;
#else
// Allow for classic classes as mixins.
/* Allow for classic classes as mixins. */
if (PyClass_Check(cls))
cls_dict = ((PyClassObject *)cls)->cl_dict;
else
cls_dict = ((PyTypeObject *)cls)->tp_dict;
#endif
if (cls_dict != NULL && (reimp = PyDict_GetItem(cls_dict, mname_obj)) != NULL)
/*
* Check any possible reimplementation is not the wrapped C++ method or
* a default special method implementation..
*/
if (cls_dict != NULL && (cls_attr = PyDict_GetItem(cls_dict, mname_obj)) != NULL && Py_TYPE(cls_attr) != &sipMethodDescr_Type && Py_TYPE(cls_attr) != &PyWrapperDescr_Type)
{
/*
* Check any reimplementation is Python code and is not the wrapped
* C++ method.
*/
if (PyMethod_Check(reimp))
{
/* It's already a method but make sure it is bound. */
if (PyMethod_GET_SELF(reimp) != NULL)
{
Py_INCREF(reimp);
}
else
{
#if PY_MAJOR_VERSION >= 3
reimp = PyMethod_New(PyMethod_GET_FUNCTION(reimp),
(PyObject *)sipSelf);
#else
reimp = PyMethod_New(PyMethod_GET_FUNCTION(reimp),
(PyObject *)sipSelf, PyMethod_GET_CLASS(reimp));
#endif
}
break;
}
if (PyFunction_Check(reimp))
{
#if PY_MAJOR_VERSION >= 3
reimp = PyMethod_New(reimp, (PyObject *)sipSelf);
#else
reimp = PyMethod_New(reimp, (PyObject *)sipSelf, cls);
#endif
break;
}
reimp = NULL;
reimp = cls_attr;
break;
}
}
Py_DECREF(mname_obj);
if (reimp == NULL)
if (reimp != NULL)
{
/*
* Emulate the behaviour of a descriptor to make sure we return a bound
* method.
*/
if (PyMethod_Check(reimp))
{
/* It's already a method but make sure it is bound. */
if (PyMethod_GET_SELF(reimp) != NULL)
{
Py_INCREF(reimp);
}
else
{
#if PY_MAJOR_VERSION >= 3
reimp = PyMethod_New(PyMethod_GET_FUNCTION(reimp),
(PyObject *)sipSelf);
#else
reimp = PyMethod_New(PyMethod_GET_FUNCTION(reimp),
(PyObject *)sipSelf, PyMethod_GET_CLASS(reimp));
#endif
}
}
else if (PyFunction_Check(reimp))
{
#if PY_MAJOR_VERSION >= 3
reimp = PyMethod_New(reimp, (PyObject *)sipSelf);
#else
reimp = PyMethod_New(reimp, (PyObject *)sipSelf, cls);
#endif
}
else
{
/*
* We don't know what it is so just return and assume that an
* appropriate exception will be raised later on.
*/
Py_INCREF(reimp);
}
}
else
{
/* Use the fast track in future. */
*pymc = 1;
@@ -8299,9 +8330,15 @@ static void sip_api_call_hook(const char *hookname)
if ((dictofmods = PyImport_GetModuleDict()) == NULL)
return;
#if PY_MAJOR_VERSION >= 3
/* Get the builtins module. */
if ((mod = PyDict_GetItemString(dictofmods, "builtins")) == NULL)
return;
#else
/* Get the __builtin__ module. */
if ((mod = PyDict_GetItemString(dictofmods, "__builtin__")) == NULL)
return;
#endif
/* Get it's dictionary. */
if ((dict = PyModule_GetDict(mod)) == NULL)
@@ -9192,9 +9229,9 @@ static void sipSimpleWrapper_releasebuffer(sipSimpleWrapper *self,
const sipClassTypeDef *ctd;
if ((ptr = getPtrTypeDef(self, &ctd)) == NULL)
return -1;
return;
return ctd->ctd_releasebuffer((PyObject *)self, ptr, buf);
ctd->ctd_releasebuffer((PyObject *)self, ptr, buf);
}
#endif
@@ -10662,7 +10699,11 @@ static int convertToWCharArray(PyObject *obj, wchar_t **ap, SIP_SSIZE_T *aszp)
if ((wc = sip_api_malloc(ulen * sizeof (wchar_t))) == NULL)
return -1;
#if PY_VERSION_HEX >= 0x03020000
ulen = PyUnicode_AsWideChar(obj, wc, ulen);
#else
ulen = PyUnicode_AsWideChar((PyUnicodeObject *)obj, wc, ulen);
#endif
if (ulen < 0)
{
@@ -10713,7 +10754,11 @@ static int convertToWChar(PyObject *obj, wchar_t *ap)
if (PyUnicode_GET_SIZE(obj) != 1)
return -1;
#if PY_VERSION_HEX >= 0x03020000
if (PyUnicode_AsWideChar(obj, ap, 1) != 1)
#else
if (PyUnicode_AsWideChar((PyUnicodeObject *)obj, ap, 1) != 1)
#endif
return -1;
return 0;
@@ -10769,7 +10814,11 @@ static int convertToWCharString(PyObject *obj, wchar_t **ap)
if ((wc = sip_api_malloc((ulen + 1) * sizeof (wchar_t))) == NULL)
return -1;
#if PY_VERSION_HEX >= 0x03020000
ulen = PyUnicode_AsWideChar(obj, wc, ulen);
#else
ulen = PyUnicode_AsWideChar((PyUnicodeObject *)obj, wc, ulen);
#endif
if (ulen < 0)
{

2
sip/siplib/threads.c
View File

@@ -3,7 +3,7 @@
* C++ classes that provide a thread interface to interact properly with the
* Python threading infrastructure.
*
* Copyright (c) 2010 Riverbank Computing Limited <info@riverbankcomputing.com>
* Copyright (c) 2011 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*

6
sip/siplib/voidptr.c
View File

@@ -1,7 +1,7 @@
/*
* SIP library code.
*
* Copyright (c) 2010 Riverbank Computing Limited <info@riverbankcomputing.com>
* Copyright (c) 2011 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*
@@ -429,7 +429,7 @@ static PyObject *sipVoidPtr_subscript(PyObject *self, PyObject *key)
{
Py_ssize_t start, stop, step, slicelength;
if (PySlice_GetIndicesEx((PySliceObject *)key, v->size, &start, &stop, &step, &slicelength) < 0)
if (sipConvertFromSliceObject(key, v->size, &start, &stop, &step, &slicelength) < 0)
return NULL;
if (step != 1)
@@ -486,7 +486,7 @@ static int sipVoidPtr_ass_subscript(PyObject *self, PyObject *key,
{
Py_ssize_t stop, step;
if (PySlice_GetIndicesEx((PySliceObject *)key, v->size, &start, &stop, &step, &size) < 0)
if (sipConvertFromSliceObject(key, v->size, &start, &stop, &step, &size) < 0)
return -1;
if (step != 1)