diff options
| author | Rémy Léone <remy.leone@gmail.com> | 2015-11-07 12:00:36 +0100 |
|---|---|---|
| committer | Rémy Léone <remy.leone@gmail.com> | 2015-11-07 12:00:36 +0100 |
| commit | def49ba8fa3fe252c26c210d7730ed5c3a42c60e (patch) | |
| tree | c9f3f8ee031fdfbb1db2350c909e0682a2065820 /numpy/distutils | |
| parent | 98f8f9c6876f2338ac783a542f5466aea03561ae (diff) | |
| download | numpy-def49ba8fa3fe252c26c210d7730ed5c3a42c60e.tar.gz | |
MAINT: Dictionary litteral
Diffstat (limited to 'numpy/distutils')
| -rw-r--r-- | numpy/distutils/system_info.py | 16 | ||||
| -rw-r--r-- | numpy/distutils/tests/test_system_info.py | 17 |
2 files changed, 15 insertions, 18 deletions
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py index 0da13a7df..a0c6f44f7 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -470,15 +470,13 @@ class system_info(object): ): self.__class__.info = {} self.local_prefixes = [] - defaults = {} - 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['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 = {'library_dirs': os.pathsep.join(default_lib_dirs), + 'include_dirs': os.pathsep.join(default_include_dirs), + 'runtime_library_dirs': os.pathsep.join(default_runtime_dirs), + 'rpath': '', + 'src_dirs': os.pathsep.join(default_src_dirs), + 'search_static_first': str(self.search_static_first), + 'extra_compile_args': '', '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 f9d45319e..58ad05a59 100644 --- a/numpy/distutils/tests/test_system_info.py +++ b/numpy/distutils/tests/test_system_info.py @@ -64,15 +64,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['search_static_first'] = "0" - defaults['extra_compile_args'] = '' - defaults['extra_link_args'] = '' + defaults = {'library_dirs': '', + 'include_dirs': '', + 'runtime_library_dirs': '', + 'rpath': '', + 'src_dirs': '', + 'search_static_first': "0", + 'extra_compile_args': '', + 'extra_link_args': ''} self.cp = ConfigParser(defaults) # We have to parse the config files afterwards # to have a consistent temporary filepath |