diff options
| author | Ondrej Oprala | 2013-08-29 14:57:04 +0200 |
|---|---|---|
| committer | Karel Zak | 2013-09-20 12:48:53 +0200 |
| commit | 464074532c0d1898f945a00c2f143e5b3ca59601 (patch) | |
| tree | beb19a7e647b6738c57a822d7c4fdb8992042bb0 /libmount/python/context.c | |
| parent | build-sys: support --with-python[={2,3}] (diff) | |
| download | kernel-qcow2-util-linux-464074532c0d1898f945a00c2f143e5b3ca59601.tar.gz kernel-qcow2-util-linux-464074532c0d1898f945a00c2f143e5b3ca59601.tar.xz kernel-qcow2-util-linux-464074532c0d1898f945a00c2f143e5b3ca59601.zip | |
pylibmount: rewrite to be py2/py3 universal
Signed-off-by: Ondrej Oprala <ooprala@redhat.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libmount/python/context.c')
| -rw-r--r-- | libmount/python/context.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libmount/python/context.c b/libmount/python/context.c index 662c89437..ce7711b3f 100644 --- a/libmount/python/context.c +++ b/libmount/python/context.c @@ -53,7 +53,7 @@ static void Context_dealloc(ContextObjext *self) Py_XDECREF(mnt_context_get_mtab_userdata(self->cxt)); mnt_free_context(self->cxt); - self->ob_type->tp_free((PyObject*) self); + PyFree(self); } static PyObject *Context_new(PyTypeObject *type, @@ -570,11 +570,11 @@ static int Context_set_optsmode(ContextObjext *self, PyObject *value, void *clos PyErr_SetString(PyExc_TypeError, NODEL_ATTR); return -1; } - else if (!PyInt_Check(value)) { + else if (!PyLong_Check(value)) { PyErr_SetString(PyExc_TypeError, ARG_ERR); return -1; } - optsmode = PyInt_AsLong(value); + optsmode = PyLong_AsLong(value); return mnt_context_set_optsmode(self->cxt, optsmode); } @@ -586,11 +586,11 @@ static int Context_set_syscall_status(ContextObjext *self, PyObject *value, void PyErr_SetString(PyExc_TypeError, NODEL_ATTR); return -1; } - else if (!PyInt_Check(value)) { + else if (!PyLong_Check(value)) { PyErr_SetString(PyExc_TypeError, ARG_ERR); return -1; } - syscall_status = PyInt_AsLong(value); + syscall_status = PyLong_AsLong(value); return mnt_context_set_syscall_status(self->cxt, syscall_status); } @@ -1169,13 +1169,12 @@ static PyMethodDef Context_methods[] = { static PyObject *Context_repr(ContextObjext *self) { - return PyString_FromFormat("<libmount.Context object at %p, restricted=%s>", + return PyUnicode_FromFormat("<libmount.Context object at %p, restricted=%s>", self, mnt_context_is_restricted(self->cxt) ? "True" : "False"); } PyTypeObject ContextType = { - PyObject_HEAD_INIT(NULL) - 0, /*ob_size*/ + PyVarObject_HEAD_INIT(NULL, 0) "libmount.Context", /*tp_name*/ sizeof(ContextObjext), /*tp_basicsize*/ 0, /*tp_itemsize*/ |