diff options
| author | Tarek Ziade <tarek@ziade.org> | 2011-05-21 10:00:10 (GMT) |
|---|---|---|
| committer | Tarek Ziade <tarek@ziade.org> | 2011-05-21 10:00:10 (GMT) |
| commit | 91f0e346cc6ef0b093bd9ac2ccf98f7d46c22b09 (patch) | |
| tree | dca455375c57cce896a6a00043ab34e1275f6ce4 | |
| parent | ec9b76d282ecb3a1a113574f24b476ad3309e574 (diff) | |
| download | cpython-91f0e346cc6ef0b093bd9ac2ccf98f7d46c22b09.zip cpython-91f0e346cc6ef0b093bd9ac2ccf98f7d46c22b09.tar.gz cpython-91f0e346cc6ef0b093bd9ac2ccf98f7d46c22b09.tar.bz2 | |
fixed the way the cfg file markers values are split under win32
| -rw-r--r-- | Lib/packaging/config.py | 3 | ||||
| -rw-r--r-- | 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) |