summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2018-11-05 16:20:25 +0200
committerGitHub <noreply@github.com>2018-11-05 16:20:25 +0200
commitb841e0aececb0e28ff3fabe29bf22c4b86fae9d8 (patch)
tree86d7a2df82f994d0427138568ec1a04bbcc93315
parentf45153a292dc749defaa9c6c1ce9c4062f083b6d (diff)
downloadpython-setuptools-git-b841e0aececb0e28ff3fabe29bf22c4b86fae9d8.tar.gz
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.
-rw-r--r--command/bdist_dumb.py2
-rw-r--r--command/bdist_msi.py4
-rw-r--r--command/bdist_rpm.py2
-rw-r--r--command/bdist_wininst.py4
-rw-r--r--command/build_ext.py2
5 files changed, 7 insertions, 7 deletions
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index e9274d92..f0d6b5b8 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -32,7 +32,7 @@ class bdist_dumb(Command):
('skip-build', None,
"skip rebuilding everything (for testing/debugging)"),
('relative', None,
- "build the archive using relative paths"
+ "build the archive using relative paths "
"(default: false)"),
('owner=', 'u',
"Owner name used when creating a tar file"
diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index a4bd5a58..80104c37 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -98,14 +98,14 @@ class bdist_msi(Command):
('no-target-compile', 'c',
"do not compile .py to .pyc on the target system"),
('no-target-optimize', 'o',
- "do not compile .py to .pyo (optimized)"
+ "do not compile .py to .pyo (optimized) "
"on the target system"),
('dist-dir=', 'd',
"directory to put final built distributions in"),
('skip-build', None,
"skip rebuilding everything (for testing/debugging)"),
('install-script=', None,
- "basename of installation script to be run after"
+ "basename of installation script to be run after "
"installation or before deinstallation"),
('pre-install-script=', None,
"Fully qualified filename of a script to be run before "
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index ac462179..02f10dd8 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -58,7 +58,7 @@ class bdist_rpm(Command):
"RPM \"vendor\" (eg. \"Joe Blow <joe@example.com>\") "
"[default: maintainer or author from setup script]"),
('packager=', None,
- "RPM packager (eg. \"Jane Doe <jane@example.net>\")"
+ "RPM packager (eg. \"Jane Doe <jane@example.net>\") "
"[default: vendor]"),
('doc-files=', None,
"list of documentation files (space or comma-separated)"),
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 0871a4f7..fde56754 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -29,7 +29,7 @@ class bdist_wininst(Command):
('no-target-compile', 'c',
"do not compile .py to .pyc on the target system"),
('no-target-optimize', 'o',
- "do not compile .py to .pyo (optimized)"
+ "do not compile .py to .pyo (optimized) "
"on the target system"),
('dist-dir=', 'd',
"directory to put final built distributions in"),
@@ -40,7 +40,7 @@ class bdist_wininst(Command):
('skip-build', None,
"skip rebuilding everything (for testing/debugging)"),
('install-script=', None,
- "basename of installation script to be run after"
+ "basename of installation script to be run after "
"installation or before deinstallation"),
('pre-install-script=', None,
"Fully qualified filename of a script to be run before "
diff --git a/command/build_ext.py b/command/build_ext.py
index 8fad9cdc..158465d2 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -365,7 +365,7 @@ class build_ext(Command):
ext_name, build_info = ext
log.warn("old-style (ext_name, build_info) tuple found in "
- "ext_modules for extension '%s'"
+ "ext_modules for extension '%s' "
"-- please convert to Extension instance", ext_name)
if not (isinstance(ext_name, str) and