Skip to content

Commit c60aec1

Browse files
authored
Merge branch 'main' into merge-typeshed-annotations
2 parents 3817ded + baf62ad commit c60aec1

File tree

2 files changed

+6
-17
lines changed

2 files changed

+6
-17
lines changed

distutils/compilers/C/msvc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,9 +408,9 @@ def compile( # noqa: C901
408408
src = os.path.abspath(src)
409409

410410
if ext in self._c_extensions:
411-
input_opt = "/Tc" + src
411+
input_opt = f"/Tc{src}"
412412
elif ext in self._cpp_extensions:
413-
input_opt = "/Tp" + src
413+
input_opt = f"/Tp{src}"
414414
add_cpp_opts = True
415415
elif ext in self._rc_extensions:
416416
# compile .RC to .RES file

distutils/compilers/C/tests/test_base.py

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import os
21
import platform
3-
import sys
42
import sysconfig
53
import textwrap
64

@@ -11,15 +9,6 @@
119
pytestmark = pytest.mark.usefixtures('suppress_path_mangle')
1210

1311

14-
def _make_strs(paths):
15-
"""
16-
Convert paths to strings for legacy compatibility.
17-
"""
18-
if sys.version_info >= (3, 8) and platform.system() != "Windows":
19-
return paths
20-
return list(map(os.fspath, paths))
21-
22-
2312
@pytest.fixture
2413
def c_file(tmp_path):
2514
c_file = tmp_path / 'foo.c'
@@ -50,11 +39,11 @@ def test_set_include_dirs(c_file):
5039
compiler = base.new_compiler()
5140
python = sysconfig.get_paths()['include']
5241
compiler.set_include_dirs([python])
53-
compiler.compile(_make_strs([c_file]))
42+
compiler.compile([c_file])
5443

5544
# do it again, setting include dirs after any initialization
5645
compiler.set_include_dirs([python])
57-
compiler.compile(_make_strs([c_file]))
46+
compiler.compile([c_file])
5847

5948

6049
def test_has_function_prototype():
@@ -88,7 +77,7 @@ def test_include_dirs_after_multiple_compile_calls(c_file):
8877
compiler = base.new_compiler()
8978
python = sysconfig.get_paths()['include']
9079
compiler.set_include_dirs([python])
91-
compiler.compile(_make_strs([c_file]))
80+
compiler.compile([c_file])
9281
assert compiler.include_dirs == [python]
93-
compiler.compile(_make_strs([c_file]))
82+
compiler.compile([c_file])
9483
assert compiler.include_dirs == [python]

0 commit comments

Comments
 (0)