From: Berker Peksag <berker.peksag@gmail.com>
Date: Sun, 27 Jul 2014 20:22:34 +0000 (+0300)
Subject: Issue #22076: Minor grammar fix.
X-Git-Tag: v3.5.0a1~1176
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f41acb0eab3314aa9235632de9f0c705a51a6f1;p=thirdparty%2FPython%2Fcpython.git

Issue #22076: Minor grammar fix.

Patch by Martin Matusiak.
---

diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py
index 7c31ac71f6e1..3f3f3288499d 100644
--- a/Lib/test/test_csv.py
+++ b/Lib/test/test_csv.py
@@ -783,7 +783,7 @@ class TestDialectValidity(unittest.TestCase):
         with self.assertRaises(csv.Error) as cm:
             mydialect()
         self.assertEqual(str(cm.exception),
-                         '"quotechar" must be an 1-character string')
+                         '"quotechar" must be a 1-character string')
 
         mydialect.quotechar = 4
         with self.assertRaises(csv.Error) as cm:
@@ -806,13 +806,13 @@ class TestDialectValidity(unittest.TestCase):
         with self.assertRaises(csv.Error) as cm:
             mydialect()
         self.assertEqual(str(cm.exception),
-                         '"delimiter" must be an 1-character string')
+                         '"delimiter" must be a 1-character string')
 
         mydialect.delimiter = ""
         with self.assertRaises(csv.Error) as cm:
             mydialect()
         self.assertEqual(str(cm.exception),
-                         '"delimiter" must be an 1-character string')
+                         '"delimiter" must be a 1-character string')
 
         mydialect.delimiter = b","
         with self.assertRaises(csv.Error) as cm:
diff --git a/Modules/_csv.c b/Modules/_csv.c
index c8767d1ea56c..6eaaea2bca73 100644
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -248,7 +248,7 @@ _set_char(const char *name, Py_UCS4 *target, PyObject *src, Py_UCS4 dflt)
             len = PyUnicode_GetLength(src);
             if (len > 1) {
                 PyErr_Format(PyExc_TypeError,
-                    "\"%s\" must be an 1-character string",
+                    "\"%s\" must be a 1-character string",
                     name);
                 return -1;
             }
@@ -432,7 +432,7 @@ dialect_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
         goto err;
     if (self->delimiter == 0) {
         PyErr_SetString(PyExc_TypeError,
-                        "\"delimiter\" must be an 1-character string");
+                        "\"delimiter\" must be a 1-character string");
         goto err;
     }
     if (quotechar == Py_None && quoting == NULL)