From: Guido van Rossum <guido@python.org>
Date: Tue, 7 Aug 2007 23:59:30 +0000 (+0000)
Subject: Fix the last remaining test_csv failure.
X-Git-Tag: v3.0a1~496
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9769c26a35d788f44fa7ed4f3652a156055fb45;p=python

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.)
---

diff --git a/Modules/_csv.c b/Modules/_csv.c
index b0acc58a20..0df85b6abd 100644
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -185,6 +185,12 @@ Dialect_get_lineterminator(DialectObj *self)
         return get_string(self->lineterminator);
 }
 
+static PyObject *
+Dialect_get_delimiter(DialectObj *self)
+{
+        return get_nullchar_as_None(self->delimiter);
+}
+
 static PyObject *
 Dialect_get_escapechar(DialectObj *self)
 {
@@ -292,7 +298,6 @@ dialect_check_quoting(int quoting)
 #define D_OFF(x) offsetof(DialectObj, x)
 
 static struct PyMemberDef Dialect_memberlist[] = {
-	{ "delimiter",          T_CHAR, D_OFF(delimiter), READONLY },
 	{ "skipinitialspace",   T_INT, D_OFF(skipinitialspace), READONLY },
 	{ "doublequote",        T_INT, D_OFF(doublequote), READONLY },
 	{ "strict",             T_INT, D_OFF(strict), READONLY },
@@ -300,6 +305,7 @@ static struct PyMemberDef Dialect_memberlist[] = {
 };
 
 static PyGetSetDef Dialect_getsetlist[] = {
+	{ "delimiter",          (getter)Dialect_get_delimiter},
 	{ "escapechar",		(getter)Dialect_get_escapechar},
 	{ "lineterminator",	(getter)Dialect_get_lineterminator},
 	{ "quotechar",		(getter)Dialect_get_quotechar},