diff options
| author | Nick Papior Andersen <nickpapior@gmail.com> | 2015-02-26 09:30:31 +0000 |
|---|---|---|
| committer | Nick Papior Andersen <nickpapior@gmail.com> | 2015-02-26 09:30:31 +0000 |
| commit | 29b9480f62fd01b6d19da39391bd522cc66bdc6b (patch) | |
| tree | 3867982f4351499eadfd33bea4a5d3b589bf1ed8 | |
| parent | 98add1697398d93469889792739ca0721ac65284 (diff) | |
| download | numpy-29b9480f62fd01b6d19da39391bd522cc66bdc6b.tar.gz | |
BUG: Had thought the defaults where made of lists, it is simply a str.
Changed all lists to strings
| -rw-r--r-- | numpy/distutils/system_info.py | 6 | ||||
| -rw-r--r-- | numpy/distutils/tests/test_system_info.py | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py index a66cc0aae..b2a49843a 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -474,11 +474,11 @@ class system_info(object): defaults['library_dirs'] = os.pathsep.join(default_lib_dirs) defaults['include_dirs'] = os.pathsep.join(default_include_dirs) defaults['runtime_library_dirs'] = os.pathsep.join(default_runtime_dirs) - defaults['rpath'] = [] + defaults['rpath'] = '' defaults['src_dirs'] = os.pathsep.join(default_src_dirs) defaults['search_static_first'] = str(self.search_static_first) - defaults['extra_compile_args'] = [] - defaults['extra_link_args'] = [] + defaults['extra_compile_args'] = '' + defaults['extra_link_args'] = '' self.cp = ConfigParser(defaults) self.files = [] self.files.extend(get_standard_file('.numpy-site.cfg')) diff --git a/numpy/distutils/tests/test_system_info.py b/numpy/distutils/tests/test_system_info.py index ed58c4002..d459acde7 100644 --- a/numpy/distutils/tests/test_system_info.py +++ b/numpy/distutils/tests/test_system_info.py @@ -62,14 +62,14 @@ class test_system_info(system_info): self.__class__.info = {} self.local_prefixes = [] defaults = {} - defaults['library_dirs'] = [] - defaults['include_dirs'] = [] - defaults['runtime_library_dirs'] = [] - defaults['rpath'] = [] - defaults['src_dirs'] = [] + defaults['library_dirs'] = '' + defaults['include_dirs'] = '' + defaults['runtime_library_dirs'] = '' + defaults['rpath'] = '' + defaults['src_dirs'] = '' defaults['search_static_first'] = "0" - defaults['extra_compile_args'] = [] - defaults['extra_link_args'] = [] + defaults['extra_compile_args'] = '' + defaults['extra_link_args'] = '' self.cp = ConfigParser(defaults) # We have to parse the config files afterwards # to have a consistent temporary filepath |