Skip to content

Commit 1d11b1c

Browse files
committed
👹 Feed the hobgoblins (delint).
Remove now extraneous adjacent strings.
1 parent 2415d50 commit 1d11b1c

File tree

13 files changed

+23
-30
lines changed

13 files changed

+23
-30
lines changed

distutils/_msvccompiler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ def initialize(self, plat_name=None):
253253
vc_env = _get_vc_env(plat_spec)
254254
if not vc_env:
255255
raise DistutilsPlatformError(
256-
"Unable to find a compatible " "Visual Studio installation."
256+
"Unable to find a compatible Visual Studio installation."
257257
)
258258
self._configure(vc_env)
259259

distutils/ccompiler.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ def _fix_lib_args(self, libraries, library_dirs, runtime_library_dirs):
465465
)
466466
else:
467467
raise TypeError(
468-
"'runtime_library_dirs' (if supplied) " "must be a list of strings"
468+
"'runtime_library_dirs' (if supplied) must be a list of strings"
469469
)
470470

471471
return (libraries, library_dirs, runtime_library_dirs)
@@ -1245,7 +1245,7 @@ def gen_lib_options(compiler, library_dirs, runtime_library_dirs, libraries):
12451245
lib_opts.append(lib_file)
12461246
else:
12471247
compiler.warn(
1248-
"no library file corresponding to " "'%s' found (skipping)" % lib
1248+
"no library file corresponding to '%s' found (skipping)" % lib
12491249
)
12501250
else:
12511251
lib_opts.append(compiler.library_option(lib))

distutils/command/bdist.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,18 @@ class bdist(Command):
4747
(
4848
'dist-dir=',
4949
'd',
50-
"directory to put final built distributions in " "[default: dist]",
50+
"directory to put final built distributions in [default: dist]",
5151
),
5252
('skip-build', None, "skip rebuilding everything (for testing/debugging)"),
5353
(
5454
'owner=',
5555
'u',
56-
"Owner name used when creating a tar file" " [default: current user]",
56+
"Owner name used when creating a tar file [default: current user]",
5757
),
5858
(
5959
'group=',
6060
'g',
61-
"Group name used when creating a tar file" " [default: current group]",
61+
"Group name used when creating a tar file [default: current group]",
6262
),
6363
]
6464

distutils/command/bdist_dumb.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class bdist_dumb(Command):
2828
(
2929
'format=',
3030
'f',
31-
"archive format to create (tar, gztar, bztar, xztar, " "ztar, zip)",
31+
"archive format to create (tar, gztar, bztar, xztar, ztar, zip)",
3232
),
3333
(
3434
'keep-temp',
@@ -41,17 +41,17 @@ class bdist_dumb(Command):
4141
(
4242
'relative',
4343
None,
44-
"build the archive using relative paths " "(default: false)",
44+
"build the archive using relative paths (default: false)",
4545
),
4646
(
4747
'owner=',
4848
'u',
49-
"Owner name used when creating a tar file" " [default: current user]",
49+
"Owner name used when creating a tar file [default: current user]",
5050
),
5151
(
5252
'group=',
5353
'g',
54-
"Group name used when creating a tar file" " [default: current group]",
54+
"Group name used when creating a tar file [default: current group]",
5555
),
5656
]
5757

distutils/command/bdist_rpm.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class bdist_rpm(Command):
3434
(
3535
'dist-dir=',
3636
'd',
37-
"directory to put final RPM files in " "(and .spec files if --spec-only)",
37+
"directory to put final RPM files in (and .spec files if --spec-only)",
3838
),
3939
(
4040
'python=',
@@ -75,7 +75,7 @@ class bdist_rpm(Command):
7575
(
7676
'packager=',
7777
None,
78-
"RPM packager (eg. \"Jane Doe <[email protected]>\") " "[default: vendor]",
78+
"RPM packager (eg. \"Jane Doe <[email protected]>\") [default: vendor]",
7979
),
8080
('doc-files=', None, "list of documentation files (space or comma-separated)"),
8181
('changelog=', None, "RPM changelog"),
@@ -214,7 +214,7 @@ def finalize_options(self):
214214

215215
if os.name != 'posix':
216216
raise DistutilsPlatformError(
217-
"don't know how to create RPM " "distributions on platform %s" % os.name
217+
"don't know how to create RPM distributions on platform %s" % os.name
218218
)
219219
if self.binary_only and self.source_only:
220220
raise DistutilsOptionError(

distutils/command/build_ext.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -427,9 +427,7 @@ def check_extensions_list(self, extensions): # noqa: C901
427427
# Medium-easy stuff: same syntax/semantics, different names.
428428
ext.runtime_library_dirs = build_info.get('rpath')
429429
if 'def_file' in build_info:
430-
log.warning(
431-
"'def_file' element of build info dict " "no longer supported"
432-
)
430+
log.warning("'def_file' element of build info dict no longer supported")
433431

434432
# Non-trivial stuff: 'macros' split into 'define_macros'
435433
# and 'undef_macros'.

distutils/command/build_scripts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ def _validate_shebang(shebang, encoding):
156156
try:
157157
shebang.encode('utf-8')
158158
except UnicodeEncodeError:
159-
raise ValueError(f"The shebang ({shebang!r}) is not encodable " "to utf-8")
159+
raise ValueError(f"The shebang ({shebang!r}) is not encodable to utf-8")
160160

161161
# If the script is encoded to a custom encoding (use a
162162
# #coding:xxx cookie), the shebang has to be encodable to

distutils/command/install.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ def run(self):
701701
# internally, and not to sys.path, so we don't check the platform
702702
# matches what we are running.
703703
if self.warn_dir and build_plat != get_platform():
704-
raise DistutilsPlatformError("Can't install when " "cross-compiling")
704+
raise DistutilsPlatformError("Can't install when cross-compiling")
705705

706706
# Run all sub-commands (at least those that need to be run)
707707
for cmd_name in self.get_sub_commands():

distutils/command/sdist.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def checking_metadata(self):
6161
(
6262
'manifest-only',
6363
'o',
64-
"just regenerate the manifest and then stop " "(implies --force-manifest)",
64+
"just regenerate the manifest and then stop (implies --force-manifest)",
6565
),
6666
(
6767
'force-manifest',
@@ -78,7 +78,7 @@ def checking_metadata(self):
7878
(
7979
'dist-dir=',
8080
'd',
81-
"directory to put the source distribution archive(s) in " "[default: dist]",
81+
"directory to put the source distribution archive(s) in [default: dist]",
8282
),
8383
(
8484
'metadata-check',

distutils/fancy_getopt.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,7 @@ def _grok_option_table(self): # noqa: C901
161161
# Type- and value-check the option names
162162
if not isinstance(long, str) or len(long) < 2:
163163
raise DistutilsGetoptError(
164-
("invalid long option '%s': " "must be a string of length >= 2")
165-
% long
164+
("invalid long option '%s': must be a string of length >= 2") % long
166165
)
167166

168167
if not ((short is None) or (isinstance(short, str) and len(short) == 1)):

0 commit comments

Comments
 (0)