From: Tarek Ziade Date: Sat, 21 May 2011 10:00:10 +0000 (+0200) Subject: fixed the way the cfg file markers values are split under win32 X-Git-Tag: v3.3.0a1~2212 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91f0e346cc6ef0b093bd9ac2ccf98f7d46c22b09;p=python fixed the way the cfg file markers values are split under win32 --- diff --git a/Lib/packaging/config.py b/Lib/packaging/config.py index 6bbfdc30e9..6df2babb27 100644 --- a/Lib/packaging/config.py +++ b/Lib/packaging/config.py @@ -21,7 +21,8 @@ def _pop_values(values_dct, key): if not vals_str: return fields = [] - for field in vals_str.split(os.linesep): + # the line separator is \n for setup.cfg files + for field in vals_str.split('\n'): tmp_vals = field.split('--') if len(tmp_vals) == 2 and not interpret(tmp_vals[1]): continue diff --git a/Lib/packaging/tests/test_config.py b/Lib/packaging/tests/test_config.py index ac4f40320f..6f70817300 100644 --- a/Lib/packaging/tests/test_config.py +++ b/Lib/packaging/tests/test_config.py @@ -307,7 +307,7 @@ class ConfigTestCase(support.TempdirManager, ['/usr/include/gecode', '/usr/include/blitz']) cargs = ['-fPIC', '-O2'] if sys.platform == 'win32': - cargs.append("/DGECODE_VERSION='win32'") + cargs.append("/DGECODE_VERSION=win32") else: cargs.append('-DGECODE_VERSION=$(./gecode_version)') self.assertEqual(ext.extra_compile_args, cargs)