Kaydet (Commit) a9769c26 authored tarafından Guido van Rossum's avatar Guido van Rossum

Fix the last remaining test_csv failure.

We were using T_CHAR for a UNICODE character.
(This happened to work on x86 most of the time due to endianness;
but not on PPC.)
üst 75c26bc6
...@@ -185,6 +185,12 @@ Dialect_get_lineterminator(DialectObj *self) ...@@ -185,6 +185,12 @@ Dialect_get_lineterminator(DialectObj *self)
return get_string(self->lineterminator); return get_string(self->lineterminator);
} }
static PyObject *
Dialect_get_delimiter(DialectObj *self)
{
return get_nullchar_as_None(self->delimiter);
}
static PyObject * static PyObject *
Dialect_get_escapechar(DialectObj *self) Dialect_get_escapechar(DialectObj *self)
{ {
...@@ -292,7 +298,6 @@ dialect_check_quoting(int quoting) ...@@ -292,7 +298,6 @@ dialect_check_quoting(int quoting)
#define D_OFF(x) offsetof(DialectObj, x) #define D_OFF(x) offsetof(DialectObj, x)
static struct PyMemberDef Dialect_memberlist[] = { static struct PyMemberDef Dialect_memberlist[] = {
{ "delimiter", T_CHAR, D_OFF(delimiter), READONLY },
{ "skipinitialspace", T_INT, D_OFF(skipinitialspace), READONLY }, { "skipinitialspace", T_INT, D_OFF(skipinitialspace), READONLY },
{ "doublequote", T_INT, D_OFF(doublequote), READONLY }, { "doublequote", T_INT, D_OFF(doublequote), READONLY },
{ "strict", T_INT, D_OFF(strict), READONLY }, { "strict", T_INT, D_OFF(strict), READONLY },
...@@ -300,6 +305,7 @@ static struct PyMemberDef Dialect_memberlist[] = { ...@@ -300,6 +305,7 @@ static struct PyMemberDef Dialect_memberlist[] = {
}; };
static PyGetSetDef Dialect_getsetlist[] = { static PyGetSetDef Dialect_getsetlist[] = {
{ "delimiter", (getter)Dialect_get_delimiter},
{ "escapechar", (getter)Dialect_get_escapechar}, { "escapechar", (getter)Dialect_get_escapechar},
{ "lineterminator", (getter)Dialect_get_lineterminator}, { "lineterminator", (getter)Dialect_get_lineterminator},
{ "quotechar", (getter)Dialect_get_quotechar}, { "quotechar", (getter)Dialect_get_quotechar},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment