diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2014-06-09 19:58:22 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2014-06-24 15:08:04 -0400 |
| commit | 11e29599ccf212955921915e4a01256b5b41511e (patch) | |
| tree | 3290245f52851820390efecc29a3897f9b3d8227 /src/multi.c | |
| parent | 09401222506dcb282e482f7cd3c6d86618a2a0a6 (diff) | |
| download | pycurl-11e29599ccf212955921915e4a01256b5b41511e.tar.gz | |
Replace module-level factory functions with proper constructors
Diffstat (limited to 'src/multi.c')
| -rw-r--r-- | src/multi.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/multi.c b/src/multi.c index 0654b9e..b41e2da 100644 --- a/src/multi.c +++ b/src/multi.c @@ -44,14 +44,12 @@ check_multi_state(const CurlMultiObject *self, int flags, const char *name) /* --------------- construct/destruct (i.e. open/close) --------------- */ -/* constructor - this is a module-level function returning a new instance */ +/* constructor */ PYCURL_INTERNAL CurlMultiObject * -do_multi_new(PyObject *dummy) +do_multi_new(PyTypeObject *subtype, PyObject *args, PyObject *kwds) { CurlMultiObject *self; - UNUSED(dummy); - /* Allocate python curl-multi object */ self = (CurlMultiObject *) p_CurlMulti_Type->tp_alloc(p_CurlMulti_Type, 0); if (!self) { @@ -845,11 +843,7 @@ PYCURL_INTERNAL PyTypeObject CurlMulti_Type = { 0, /* tp_weaklistoffset */ 0, /* tp_iter */ 0, /* tp_iternext */ -#if PY_MAJOR_VERSION >= 3 curlmultiobject_methods, /* tp_methods */ -#else - 0, /* tp_methods */ -#endif 0, /* tp_members */ 0, /* tp_getset */ 0, /* tp_base */ @@ -859,7 +853,7 @@ PYCURL_INTERNAL PyTypeObject CurlMulti_Type = { 0, /* tp_dictoffset */ 0, /* tp_init */ PyType_GenericAlloc, /* tp_alloc */ - 0, /* tp_new */ + (newfunc)do_multi_new, /* tp_new */ }; /* vi:ts=4:et:nowrap |