summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2018-11-05 14:20:25 (GMT)
committerGitHub <noreply@github.com>2018-11-05 14:20:25 (GMT)
commit34fd4c20198dea6ab2fe8dc6d32d744d9bde868d (patch)
tree7219828610de765ae5c41883b590d5c6f598ade2 /Modules
parentad1a25f499362eaf9cbfcafa0b8e2454eb43dcf1 (diff)
downloadcpython-34fd4c20198dea6ab2fe8dc6d32d744d9bde868d.zip
cpython-34fd4c20198dea6ab2fe8dc6d32d744d9bde868d.tar.gz
cpython-34fd4c20198dea6ab2fe8dc6d32d744d9bde868d.tar.bz2
bpo-35133: Fix mistakes when concatenate string literals on different lines. (GH-10284)
Two kind of mistakes: 1. Missed space. After concatenating there is no space between words. 2. Missed comma. Causes unintentional concatenating in a list of strings.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_datetimemodule.c2
-rw-r--r--Modules/_io/textio.c2
-rw-r--r--Modules/_pickle.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index bc4caa0..2db95b4 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -3446,7 +3446,7 @@ tzinfo_fromutc(PyDateTime_TZInfo *self, PyObject *dt)
return result;
Inconsistent:
- PyErr_SetString(PyExc_ValueError, "fromutc: tz.dst() gave"
+ PyErr_SetString(PyExc_ValueError, "fromutc: tz.dst() gave "
"inconsistent results; cannot convert");
/* fall through to failure */
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index be42777..8924834 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -1313,7 +1313,7 @@ _io_TextIOWrapper_reconfigure_impl(textio *self, PyObject *encoding,
/* Check if something is in the read buffer */
if (self->decoded_chars != NULL) {
if (encoding != Py_None || errors != Py_None || newline_obj != NULL) {
- _unsupported("It is not possible to set the encoding or newline"
+ _unsupported("It is not possible to set the encoding or newline "
"of stream after the first read");
return NULL;
}
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index 0e3bd22..2166d29 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -4612,7 +4612,7 @@ Pickler_set_memo(PicklerObject *self, PyObject *obj)
}
else {
PyErr_Format(PyExc_TypeError,
- "'memo' attribute must be a PicklerMemoProxy object"
+ "'memo' attribute must be a PicklerMemoProxy object "
"or dict, not %.200s", Py_TYPE(obj)->tp_name);
return -1;
}
@@ -7048,7 +7048,7 @@ Unpickler_set_memo(UnpicklerObject *self, PyObject *obj)
}
else {
PyErr_Format(PyExc_TypeError,
- "'memo' attribute must be an UnpicklerMemoProxy object"
+ "'memo' attribute must be an UnpicklerMemoProxy object "
"or dict, not %.200s", Py_TYPE(obj)->tp_name);
return -1;
}