psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2024-11-26 19:03:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

We don't need to expose cursor_init(), call tp_init() on the type instead.

Browse Source
This commit is contained in:
Oleksandr Shulgin 2016-03-08 18:23:32 +01:00
parent da6e061ee8
commit 1d52f34e60
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
psycopg/cursor.h
View File

@ -90,14 +90,11 @@ struct cursorObject {
/* C-callable functions in cursor_int.c and cursor_type.c */ /* C-callable functions in cursor_int.c and cursor_type.c */
HIDDEN int cursor_init(PyObject *obj, PyObject *args, PyObject *kwargs);
BORROWED HIDDEN PyObject *curs_get_cast(cursorObject *self, PyObject *oid); BORROWED HIDDEN PyObject *curs_get_cast(cursorObject *self, PyObject *oid);
HIDDEN void curs_reset(cursorObject *self); HIDDEN void curs_reset(cursorObject *self);
HIDDEN int psyco_curs_withhold_set(cursorObject *self, PyObject *pyvalue); HIDDEN int psyco_curs_withhold_set(cursorObject *self, PyObject *pyvalue);
HIDDEN int psyco_curs_scrollable_set(cursorObject *self, PyObject *pyvalue); HIDDEN int psyco_curs_scrollable_set(cursorObject *self, PyObject *pyvalue);
/* exception-raising macros */ /* exception-raising macros */
#define EXC_IF_CURS_CLOSED(self) \ #define EXC_IF_CURS_CLOSED(self) \
do { \ do { \

2
psycopg/cursor_type.c
View File

@ -1901,7 +1901,7 @@ cursor_dealloc(PyObject* obj)
Py_TYPE(obj)->tp_free(obj); Py_TYPE(obj)->tp_free(obj);
} }
int static int
cursor_init(PyObject *obj, PyObject *args, PyObject *kwargs) cursor_init(PyObject *obj, PyObject *args, PyObject *kwargs)
{ {
PyObject *conn; PyObject *conn;

13
psycopg/replication_cursor_type.c
View File

@ -244,8 +244,10 @@ static struct PyGetSetDef replicationCursorObject_getsets[] = {
}; };
static int static int
replicationCursor_setup(replicationCursorObject* self) replicationCursor_init(PyObject *obj, PyObject *args, PyObject *kwargs)
{ {
replicationCursorObject *self = (replicationCursorObject *)obj;
self->started = 0; self->started = 0;
self->consuming = 0; self->consuming = 0;
self->decode = 0; self->decode = 0;
@ -254,14 +256,7 @@ replicationCursor_setup(replicationCursorObject* self)
self->flush_lsn = 0; self->flush_lsn = 0;
self->apply_lsn = 0; self->apply_lsn = 0;
return 0; return cursorType.tp_init(obj, args, kwargs);
}
static int
replicationCursor_init(PyObject *obj, PyObject *args, PyObject *kwargs)
{
replicationCursor_setup((replicationCursorObject *)obj);
return cursor_init(obj, args, kwargs);
} }
static PyObject * static PyObject *