Skip to content

Commit 53c82a2

Browse files
authored
Merge pull request pypa#239 from DimitriPapadopoulos/extra_pairs_of_quotes
Remove extra quotes from litteral strings
2 parents e5e3cc1 + b81e1a5 commit 53c82a2

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

distutils/tests/test_cygwinccompiler.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,25 +80,25 @@ def test_get_msvcr(self):
8080

8181
# MSVC 7.0
8282
sys.version = (
83-
'2.5.1 (r251:54863, Apr 18 2007, 08:51:08) ' '[MSC v.1300 32 bits (Intel)]'
83+
'2.5.1 (r251:54863, Apr 18 2007, 08:51:08) [MSC v.1300 32 bits (Intel)]'
8484
)
8585
assert get_msvcr() == ['msvcr70']
8686

8787
# MSVC 7.1
8888
sys.version = (
89-
'2.5.1 (r251:54863, Apr 18 2007, 08:51:08) ' '[MSC v.1310 32 bits (Intel)]'
89+
'2.5.1 (r251:54863, Apr 18 2007, 08:51:08) [MSC v.1310 32 bits (Intel)]'
9090
)
9191
assert get_msvcr() == ['msvcr71']
9292

9393
# VS2005 / MSVC 8.0
9494
sys.version = (
95-
'2.5.1 (r251:54863, Apr 18 2007, 08:51:08) ' '[MSC v.1400 32 bits (Intel)]'
95+
'2.5.1 (r251:54863, Apr 18 2007, 08:51:08) [MSC v.1400 32 bits (Intel)]'
9696
)
9797
assert get_msvcr() == ['msvcr80']
9898

9999
# VS2008 / MSVC 9.0
100100
sys.version = (
101-
'2.5.1 (r251:54863, Apr 18 2007, 08:51:08) ' '[MSC v.1500 32 bits (Intel)]'
101+
'2.5.1 (r251:54863, Apr 18 2007, 08:51:08) [MSC v.1500 32 bits (Intel)]'
102102
)
103103
assert get_msvcr() == ['msvcr90']
104104

@@ -110,7 +110,7 @@ def test_get_msvcr(self):
110110

111111
# unknown
112112
sys.version = (
113-
'2.5.1 (r251:54863, Apr 18 2007, 08:51:08) ' '[MSC v.2000 32 bits (Intel)]'
113+
'2.5.1 (r251:54863, Apr 18 2007, 08:51:08) [MSC v.2000 32 bits (Intel)]'
114114
)
115115
with pytest.raises(ValueError):
116116
get_msvcr()

distutils/tests/test_sysconfig.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,12 @@ def test_customize_compiler(self):
132132
assert comp.exes['preprocessor'] == 'env_cpp --env-cppflags'
133133
assert comp.exes['compiler'] == 'env_cc --sc-cflags --env-cflags --env-cppflags'
134134
assert comp.exes['compiler_so'] == (
135-
'env_cc --sc-cflags ' '--env-cflags ' '--env-cppflags --sc-ccshared'
135+
'env_cc --sc-cflags --env-cflags --env-cppflags --sc-ccshared'
136136
)
137137
assert comp.exes['compiler_cxx'] == 'env_cxx --env-cxx-flags'
138138
assert comp.exes['linker_exe'] == 'env_cc'
139139
assert comp.exes['linker_so'] == (
140-
'env_ldshared --env-ldflags --env-cflags' ' --env-cppflags'
140+
'env_ldshared --env-ldflags --env-cflags --env-cppflags'
141141
)
142142
assert comp.shared_lib_extension == 'sc_shutil_suffix'
143143

0 commit comments

Comments
 (0)