diff options
| author | John Ehresman <jpe@wingware.com> | 2010-04-15 11:00:00 -0400 |
|---|---|---|
| committer | John Ehresman <jpe@wingware.com> | 2010-04-15 12:18:19 -0400 |
| commit | 8f9195d59b30f6ac96dc8f7cd9e6e6033641466a (patch) | |
| tree | f00fecd641d1c53c7ba56857363a309be47f032b | |
| parent | c467185529f9c3cd4f7d687281789ce8ee7f04be (diff) | |
| download | pygobject-8f9195d59b30f6ac96dc8f7cd9e6e6033641466a.tar.gz pygobject-8f9195d59b30f6ac96dc8f7cd9e6e6033641466a.tar.xz pygobject-8f9195d59b30f6ac96dc8f7cd9e6e6033641466a.zip | |
METH_KEYWORDS w/o METH_VARARGS is invalid in python 3
| -rw-r--r-- | glib/pygiochannel.c | 28 | ||||
| -rw-r--r-- | glib/pygsource.c | 6 | ||||
| -rw-r--r-- | gobject/pygobject.c | 2 |
3 files changed, 18 insertions, 18 deletions
diff --git a/glib/pygiochannel.c b/glib/pygiochannel.c index 15510e5..d01dd40 100644 --- a/glib/pygiochannel.c +++ b/glib/pygiochannel.c @@ -663,28 +663,28 @@ static PyMemberDef py_io_channel_members[] = { }; static PyMethodDef py_io_channel_methods[] = { - { "close", (PyCFunction)py_io_channel_shutdown, METH_KEYWORDS }, + { "close", (PyCFunction)py_io_channel_shutdown, METH_VARARGS|METH_KEYWORDS }, { "flush", (PyCFunction)py_io_channel_flush, METH_NOARGS }, - { "set_encoding", (PyCFunction)py_io_channel_set_encoding, METH_KEYWORDS }, + { "set_encoding", (PyCFunction)py_io_channel_set_encoding, METH_VARARGS|METH_KEYWORDS }, { "get_encoding", (PyCFunction)py_io_channel_get_encoding, METH_NOARGS }, - { "set_buffered", (PyCFunction)py_io_channel_set_buffered, METH_KEYWORDS }, + { "set_buffered", (PyCFunction)py_io_channel_set_buffered, METH_VARARGS|METH_KEYWORDS }, { "get_buffered", (PyCFunction)py_io_channel_get_buffered, METH_NOARGS }, - { "set_buffer_size", (PyCFunction)py_io_channel_set_buffer_size, METH_KEYWORDS }, + { "set_buffer_size", (PyCFunction)py_io_channel_set_buffer_size, METH_VARARGS|METH_KEYWORDS }, { "get_buffer_size", (PyCFunction)py_io_channel_get_buffer_size, METH_NOARGS }, - { "read", (PyCFunction)py_io_channel_read_chars, METH_KEYWORDS }, - { "readline", (PyCFunction)py_io_channel_read_line, METH_KEYWORDS }, - { "readlines", (PyCFunction)py_io_channel_read_lines, METH_KEYWORDS }, - { "write", (PyCFunction)py_io_channel_write_chars, METH_KEYWORDS }, - { "writelines", (PyCFunction)py_io_channel_write_lines, METH_KEYWORDS }, - { "set_flags", (PyCFunction)py_io_channel_set_flags, METH_KEYWORDS }, + { "read", (PyCFunction)py_io_channel_read_chars, METH_VARARGS|METH_KEYWORDS }, + { "readline", (PyCFunction)py_io_channel_read_line, METH_VARARGS|METH_KEYWORDS }, + { "readlines", (PyCFunction)py_io_channel_read_lines, METH_VARARGS|METH_KEYWORDS }, + { "write", (PyCFunction)py_io_channel_write_chars, METH_VARARGS|METH_KEYWORDS }, + { "writelines", (PyCFunction)py_io_channel_write_lines, METH_VARARGS|METH_KEYWORDS }, + { "set_flags", (PyCFunction)py_io_channel_set_flags, METH_VARARGS|METH_KEYWORDS }, { "get_flags", (PyCFunction)py_io_channel_get_flags, METH_NOARGS }, { "get_buffer_condition", (PyCFunction)py_io_channel_get_buffer_condition, METH_NOARGS }, - { "set_close_on_unref", (PyCFunction)py_io_channel_set_close_on_unref, METH_KEYWORDS }, + { "set_close_on_unref", (PyCFunction)py_io_channel_set_close_on_unref, METH_VARARGS|METH_KEYWORDS }, { "get_close_on_unref", (PyCFunction)py_io_channel_get_close_on_unref, METH_NOARGS }, - { "add_watch", (PyCFunction)py_io_channel_add_watch, METH_KEYWORDS }, - { "seek", (PyCFunction)py_io_channel_seek, METH_KEYWORDS }, + { "add_watch", (PyCFunction)py_io_channel_add_watch, METH_VARARGS|METH_KEYWORDS }, + { "seek", (PyCFunction)py_io_channel_seek, METH_VARARGS|METH_KEYWORDS }, #ifdef G_OS_WIN32 - { "win32_make_pollfd", (PyCFunction)py_io_channel_win32_make_pollfd, METH_KEYWORDS }, + { "win32_make_pollfd", (PyCFunction)py_io_channel_win32_make_pollfd, METH_VARARGS|METH_KEYWORDS }, { "win32_poll", (PyCFunction)py_io_channel_win32_poll, METH_KEYWORDS|METH_STATIC }, #endif { NULL, NULL, 0 } diff --git a/glib/pygsource.c b/glib/pygsource.c index 298b928..8ac165e 100644 --- a/glib/pygsource.c +++ b/glib/pygsource.c @@ -255,12 +255,12 @@ pyg_source_get_current_time(PyGSource *self) } static PyMethodDef pyg_source_methods[] = { - { "attach", (PyCFunction)pyg_source_attach, METH_KEYWORDS }, + { "attach", (PyCFunction)pyg_source_attach, METH_VARARGS|METH_KEYWORDS }, { "destroy", (PyCFunction)pyg_source_destroy, METH_NOARGS }, { "set_callback", (PyCFunction)pyg_source_set_callback, METH_VARARGS }, { "get_context", (PyCFunction)pyg_source_get_context, METH_NOARGS }, - { "add_poll", (PyCFunction)pyg_source_add_poll, METH_KEYWORDS }, - { "remove_poll", (PyCFunction)pyg_source_remove_poll, METH_KEYWORDS }, + { "add_poll", (PyCFunction)pyg_source_add_poll, METH_VARARGS|METH_KEYWORDS }, + { "remove_poll", (PyCFunction)pyg_source_remove_poll, METH_VARARGS|METH_KEYWORDS }, { "get_current_time", (PyCFunction)pyg_source_get_current_time, METH_NOARGS }, { NULL, NULL, 0 } }; diff --git a/gobject/pygobject.c b/gobject/pygobject.c index 33cb927..7170bb0 100644 --- a/gobject/pygobject.c +++ b/gobject/pygobject.c @@ -2042,7 +2042,7 @@ static PyMethodDef pygobject_methods[] = { { "get_property", (PyCFunction)pygobject_get_property, METH_VARARGS }, { "get_properties", (PyCFunction)pygobject_get_properties, METH_VARARGS }, { "set_property", (PyCFunction)pygobject_set_property, METH_VARARGS }, - { "set_properties", (PyCFunction)pygobject_set_properties, METH_KEYWORDS }, + { "set_properties", (PyCFunction)pygobject_set_properties, METH_VARARGS|METH_KEYWORDS }, { "freeze_notify", (PyCFunction)pygobject_freeze_notify, METH_VARARGS }, { "notify", (PyCFunction)pygobject_notify, METH_VARARGS }, { "thaw_notify", (PyCFunction)pygobject_thaw_notify, METH_VARARGS }, |