Sitelet https://github.com/python/cpython/commit/34fd4c20198dea6ab2fe8dc6d32d744d9bde868d
Skip to content

Commit 34fd4c2

Browse files
serhiy-storchakaserhiy-storchaka
authored
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.
1 parent ad1a25f commit 34fd4c2

26 files changed

Lines changed: 38 additions & 40 deletions

‎Lib/_pydecimal.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2021,7 +2021,7 @@ def _power_modulo(self, other, modulo, context=None):
20212021
if not other and not self:
20222022
return context._raise_error(InvalidOperation,
20232023
'at least one of pow() 1st argument '
2024-
'and 2nd argument must be nonzero ;'
2024+
'and 2nd argument must be nonzero; '
20252025
'0**0 is not defined')
20262026

20272027
# compute sign of result

‎Lib/concurrent/futures/thread.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def submit(self, fn, *args, **kwargs):
150150
if self._shutdown:
151151
raise RuntimeError('cannot schedule new futures after shutdown')
152152
if _shutdown:
153-
raise RuntimeError('cannot schedule new futures after'
153+
raise RuntimeError('cannot schedule new futures after '
154154
'interpreter shutdown')
155155

156156
f = _base.Future()

‎Lib/distutils/command/bdist_dumb.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class bdist_dumb(Command):
3232
('skip-build', None,
3333
"skip rebuilding everything (for testing/debugging)"),
3434
('relative', None,
35-
"build the archive using relative paths"
35+
"build the archive using relative paths "
3636
"(default: false)"),
3737
('owner=', 'u',
3838
"Owner name used when creating a tar file"

‎Lib/distutils/command/bdist_msi.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,14 @@ class bdist_msi(Command):
9898
('no-target-compile', 'c',
9999
"do not compile .py to .pyc on the target system"),
100100
('no-target-optimize', 'o',
101-
"do not compile .py to .pyo (optimized)"
101+
"do not compile .py to .pyo (optimized) "
102102
"on the target system"),
103103
('dist-dir=', 'd',
104104
"directory to put final built distributions in"),
105105
('skip-build', None,
106106
"skip rebuilding everything (for testing/debugging)"),
107107
('install-script=', None,
108-
"basename of installation script to be run after"
108+
"basename of installation script to be run after "
109109
"installation or before deinstallation"),
110110
('pre-install-script=', None,
111111
"Fully qualified filename of a script to be run before "

‎Lib/distutils/command/bdist_rpm.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class bdist_rpm(Command):
5858
"RPM \"vendor\" (eg. \"Joe Blow <joe@example.com>\") "
5959
"[default: maintainer or author from setup script]"),
6060
('packager=', None,
61-
"RPM packager (eg. \"Jane Doe <jane@example.net>\")"
61+
"RPM packager (eg. \"Jane Doe <jane@example.net>\") "
6262
"[default: vendor]"),
6363
('doc-files=', None,
6464
"list of documentation files (space or comma-separated)"),

‎Lib/distutils/command/bdist_wininst.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class bdist_wininst(Command):
2929
('no-target-compile', 'c',
3030
"do not compile .py to .pyc on the target system"),
3131
('no-target-optimize', 'o',
32-
"do not compile .py to .pyo (optimized)"
32+
"do not compile .py to .pyo (optimized) "
3333
"on the target system"),
3434
('dist-dir=', 'd',
3535
"directory to put final built distributions in"),
@@ -40,7 +40,7 @@ class bdist_wininst(Command):
4040
('skip-build', None,
4141
"skip rebuilding everything (for testing/debugging)"),
4242
('install-script=', None,
43-
"basename of installation script to be run after"
43+
"basename of installation script to be run after "
4444
"installation or before deinstallation"),
4545
('pre-install-script=', None,
4646
"Fully qualified filename of a script to be run before "

‎Lib/distutils/command/build_ext.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ def check_extensions_list(self, extensions):
365365
ext_name, build_info = ext
366366

367367
log.warn("old-style (ext_name, build_info) tuple found in "
368-
"ext_modules for extension '%s'"
368+
"ext_modules for extension '%s' "
369369
"-- please convert to Extension instance", ext_name)
370370

371371
if not (isinstance(ext_name, str) and

‎Lib/email/_header_value_parser.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2209,8 +2209,8 @@ def get_section(value):
22092209
digits += value[0]
22102210
value = value[1:]
22112211
if digits[0] == '0' and digits != '0':
2212-
section.defects.append(errors.InvalidHeaderError("section number"
2213-
"has an invalid leading 0"))
2212+
section.defects.append(errors.InvalidHeaderError(
2213+
"section number has an invalid leading 0"))
22142214
section.number = int(digits)
22152215
section.append(ValueTerminal(digits, 'digits'))
22162216
return section, value

‎Lib/idlelib/hyperparser.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ def get_expression(self):
224224
given index, which is empty if there is no real one.
225225
"""
226226
if not self.is_in_code():
227-
raise ValueError("get_expression should only be called"
227+
raise ValueError("get_expression should only be called "
228228
"if index is inside a code.")
229229

230230
rawtext = self.rawtext

‎Lib/idlelib/idle_test/htest.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def _wrapper(parent): # htest #
117117
"font face of the text in the area below it.\nIn the "
118118
"'Highlighting' tab, try different color schemes. Clicking "
119119
"items in the sample program should update the choices above it."
120-
"\nIn the 'Keys', 'General' and 'Extensions' tabs, test settings"
120+
"\nIn the 'Keys', 'General' and 'Extensions' tabs, test settings "
121121
"of interest."
122122
"\n[Ok] to close the dialog.[Apply] to apply the settings and "
123123
"and [Cancel] to revert all changes.\nRe-run the test to ensure "
@@ -152,7 +152,7 @@ def _wrapper(parent): # htest #
152152
'msg': "Test for different key modifier sequences.\n"
153153
"<nothing> is invalid.\n"
154154
"No modifier key is invalid.\n"
155-
"Shift key with [a-z],[0-9], function key, move key, tab, space"
155+
"Shift key with [a-z],[0-9], function key, move key, tab, space "
156156
"is invalid.\nNo validity checking if advanced key binding "
157157
"entry is used."
158158
}
@@ -234,7 +234,7 @@ def _wrapper(parent): # htest #
234234
'file': 'percolator',
235235
'kwds': {},
236236
'msg': "There are two tracers which can be toggled using a checkbox.\n"
237-
"Toggling a tracer 'on' by checking it should print tracer"
237+
"Toggling a tracer 'on' by checking it should print tracer "
238238
"output to the console or to the IDLE shell.\n"
239239
"If both the tracers are 'on', the output from the tracer which "
240240
"was switched 'on' later, should be printed first\n"
@@ -335,7 +335,7 @@ def _wrapper(parent): # htest #
335335
_widget_redirector_spec = {
336336
'file': 'redirector',
337337
'kwds': {},
338-
'msg': "Every text insert should be printed to the console."
338+
'msg': "Every text insert should be printed to the console "
339339
"or the IDLE shell."
340340
}
341341

0 commit comments

Comments
 (0)