diff options
author | Mark Spruiell <mes@zeroc.com> | 2012-04-24 14:16:15 -0700 |
---|---|---|
committer | Mark Spruiell <mes@zeroc.com> | 2012-04-24 14:16:15 -0700 |
commit | 943a48fc5c0a59b892eb746073c71b8dd88815e7 (patch) | |
tree | 421cfedbc60603d02e0b314d9204e9f85dd781c5 /py/modules/IcePy/Logger.cpp | |
parent | minor fix to IcePHP getLogger (diff) | |
download | ice-943a48fc5c0a59b892eb746073c71b8dd88815e7.tar.bz2 ice-943a48fc5c0a59b892eb746073c71b8dd88815e7.tar.xz ice-943a48fc5c0a59b892eb746073c71b8dd88815e7.zip |
python 3 support
Diffstat (limited to 'py/modules/IcePy/Logger.cpp')
-rw-r--r-- | py/modules/IcePy/Logger.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/py/modules/IcePy/Logger.cpp b/py/modules/IcePy/Logger.cpp index 3d7bca5d895..bacf5c45395 100644 --- a/py/modules/IcePy/Logger.cpp +++ b/py/modules/IcePy/Logger.cpp @@ -108,9 +108,9 @@ IcePy::LoggerWrapper::getObject() extern "C" #endif static LoggerObject* -loggerNew(PyObject* /*arg*/) +loggerNew(PyTypeObject* type, PyObject* /*args*/, PyObject* /*kwds*/) { - LoggerObject* self = PyObject_New(LoggerObject, &LoggerType); + LoggerObject* self = reinterpret_cast<LoggerObject*>(type->tp_alloc(type, 0)); if(!self) { return 0; @@ -126,7 +126,7 @@ static void loggerDealloc(LoggerObject* self) { delete self->logger; - PyObject_Del(self); + Py_TYPE(self)->tp_free(reinterpret_cast<PyObject*>(self)); } #ifdef WIN32 @@ -338,8 +338,7 @@ PyTypeObject LoggerType = { /* The ob_type field must be initialized in the module init function * to be portable to Windows without using C++. */ - PyObject_HEAD_INIT(0) - 0, /* ob_size */ + PyVarObject_HEAD_INIT(0, 0) STRCAST("IcePy.Logger"), /* tp_name */ sizeof(LoggerObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -348,7 +347,7 @@ PyTypeObject LoggerType = 0, /* tp_print */ 0, /* tp_getattr */ 0, /* tp_setattr */ - 0, /* tp_compare */ + 0, /* tp_reserved */ 0, /* tp_repr */ 0, /* tp_as_number */ 0, /* tp_as_sequence */ @@ -403,7 +402,7 @@ IcePy::initLogger(PyObject* module) PyObject* IcePy::createLogger(const Ice::LoggerPtr& logger) { - LoggerObject* obj = loggerNew(0); + LoggerObject* obj = loggerNew(&LoggerType, 0, 0); if(obj) { obj->logger = new Ice::LoggerPtr(logger); |