mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #22076: Minor grammar fix.

Browse source 
Patch by Martin Matusiak.
This commit is contained in:
Berker Peksag 2014-07-27 23:22:34 +03:00
parent 0efea322a9
commit 0f41acb0ea
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/test/test_csv.py
View file

@ -783,7 +783,7 @@ class TestDialectValidity(unittest.TestCase):
with self.assertRaises(csv.Error) as cm: with self.assertRaises(csv.Error) as cm:
mydialect() mydialect()
self.assertEqual(str(cm.exception), self.assertEqual(str(cm.exception),
'"quotechar" must be an 1-character string') '"quotechar" must be a 1-character string')
mydialect.quotechar = 4 mydialect.quotechar = 4
with self.assertRaises(csv.Error) as cm: with self.assertRaises(csv.Error) as cm:
@ -806,13 +806,13 @@ class TestDialectValidity(unittest.TestCase):
with self.assertRaises(csv.Error) as cm: with self.assertRaises(csv.Error) as cm:
mydialect() mydialect()
self.assertEqual(str(cm.exception), self.assertEqual(str(cm.exception),
'"delimiter" must be an 1-character string') '"delimiter" must be a 1-character string')
mydialect.delimiter = "" mydialect.delimiter = ""
with self.assertRaises(csv.Error) as cm: with self.assertRaises(csv.Error) as cm:
mydialect() mydialect()
self.assertEqual(str(cm.exception), self.assertEqual(str(cm.exception),
'"delimiter" must be an 1-character string') '"delimiter" must be a 1-character string')
mydialect.delimiter = b"," mydialect.delimiter = b","
with self.assertRaises(csv.Error) as cm: with self.assertRaises(csv.Error) as cm:

4
Modules/_csv.c
View file

@ -248,7 +248,7 @@ _set_char(const char *name, Py_UCS4 *target, PyObject *src, Py_UCS4 dflt)
len = PyUnicode_GetLength(src); len = PyUnicode_GetLength(src);
if (len > 1) { if (len > 1) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"\"%s\" must be an 1-character string", "\"%s\" must be a 1-character string",
name); name);
return -1; return -1;
} }
@ -432,7 +432,7 @@ dialect_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
goto err; goto err;
if (self->delimiter == 0) { if (self->delimiter == 0) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"\"delimiter\" must be an 1-character string"); "\"delimiter\" must be a 1-character string");
goto err; goto err;
} }
if (quotechar == Py_None && quoting == NULL) if (quotechar == Py_None && quoting == NULL)