From 91f0e346cc6ef0b093bd9ac2ccf98f7d46c22b09 Mon Sep 17 00:00:00 2001 From: Tarek Ziade Date: Sat, 21 May 2011 12:00:10 +0200 Subject: fixed the way the cfg file markers values are split under win32 --- Lib/packaging/config.py | 3 ++- Lib/packaging/tests/test_config.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/packaging/config.py b/Lib/packaging/config.py index 6bbfdc3..6df2bab 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 ac4f403..6f70817 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) -- cgit v0.12