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

Dropped encoding attribute from list adapter

Browse Source
This commit is contained in:
Daniele Varrazzo 2013-04-05 00:35:02 +01:00
parent 6bc4b23af5
commit 95ff64d739
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
psycopg/adapter_list.c
View File

@ -103,10 +103,6 @@ list_prepare(listObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "O!", &connectionType, &conn)) if (!PyArg_ParseTuple(args, "O!", &connectionType, &conn))
return NULL; return NULL;
/* note that we don't copy the encoding from the connection, but take a
reference to it; we'll need it during the recursive adapt() call (the
encoding is here for a future expansion that will make .getquoted()
work even without a connection to the backend. */
Py_CLEAR(self->connection); Py_CLEAR(self->connection);
Py_INCREF(conn); Py_INCREF(conn);
self->connection = conn; self->connection = conn;
@ -154,7 +150,7 @@ static PyMethodDef listObject_methods[] = {
/* initialization and finalization methods */ /* initialization and finalization methods */
static int static int
list_setup(listObject *self, PyObject *obj, const char *enc) list_setup(listObject *self, PyObject *obj)
{ {
Dprintf("list_setup: init list object at %p, refcnt = " Dprintf("list_setup: init list object at %p, refcnt = "
FORMAT_CODE_PY_SSIZE_T, FORMAT_CODE_PY_SSIZE_T,
@ -164,9 +160,6 @@ list_setup(listObject *self, PyObject *obj, const char *enc)
if (!PyList_Check(obj)) if (!PyList_Check(obj))
return -1; return -1;
/* FIXME: remove this orrible strdup */
if (enc) self->encoding = strdup(enc);
self->connection = NULL; self->connection = NULL;
Py_INCREF(obj); Py_INCREF(obj);
self->wrapped = obj; self->wrapped = obj;
@ -195,7 +188,6 @@ list_dealloc(PyObject* obj)
Py_CLEAR(self->wrapped); Py_CLEAR(self->wrapped);
Py_CLEAR(self->connection); Py_CLEAR(self->connection);
if (self->encoding) free(self->encoding);
Dprintf("list_dealloc: deleted list object at %p, " Dprintf("list_dealloc: deleted list object at %p, "
"refcnt = " FORMAT_CODE_PY_SSIZE_T, obj, Py_REFCNT(obj)); "refcnt = " FORMAT_CODE_PY_SSIZE_T, obj, Py_REFCNT(obj));
@ -207,12 +199,11 @@ static int
list_init(PyObject *obj, PyObject *args, PyObject *kwds) list_init(PyObject *obj, PyObject *args, PyObject *kwds)
{ {
PyObject *l; PyObject *l;
const char *enc = "latin-1"; /* default encoding as in Python */
if (!PyArg_ParseTuple(args, "O|s", &l, &enc)) if (!PyArg_ParseTuple(args, "O", &l))
return -1; return -1;
return list_setup((listObject *)obj, l, enc); return list_setup((listObject *)obj, l);
} }
static PyObject * static PyObject *
@ -279,10 +270,9 @@ PyObject *
psyco_List(PyObject *module, PyObject *args) psyco_List(PyObject *module, PyObject *args)
{ {
PyObject *str; PyObject *str;
const char *enc = "latin-1"; /* default encoding as in Python */
if (!PyArg_ParseTuple(args, "O|s", &str, &enc)) if (!PyArg_ParseTuple(args, "O", &str))
return NULL; return NULL;
return PyObject_CallFunction((PyObject *)&listType, "Os", str, enc); return PyObject_CallFunctionObjArgs((PyObject *)&listType, "O", str, NULL);
} }

1
psycopg/adapter_list.h
View File

@ -37,7 +37,6 @@ typedef struct {
PyObject *wrapped; PyObject *wrapped;
PyObject *connection; PyObject *connection;
char *encoding;
} listObject; } listObject;
HIDDEN PyObject *psyco_List(PyObject *module, PyObject *args); HIDDEN PyObject *psyco_List(PyObject *module, PyObject *args);