diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2019-02-23 21:19:51 -0800 |
|---|---|---|
| committer | Eric Wieser <wieser.eric@gmail.com> | 2019-02-24 11:57:31 -0800 |
| commit | a290dd8bea5137bf864d4b2ecc2c90f04e1d276e (patch) | |
| tree | d43aa7b261ca3b1ec775a2a8c798fc113007e140 /numpy/distutils/fcompiler | |
| parent | cdd7ab252988ff4254705e0a89874edeb5cea8eb (diff) | |
| download | numpy-a290dd8bea5137bf864d4b2ecc2c90f04e1d276e.tar.gz | |
BUG: Fix regression in parsing of F90 and F77 environment variables
Fixes gh-12979
Among other things, this means setting the `F90` environment variable to `"path to/f90" --coverage` works again.
Diffstat (limited to 'numpy/distutils/fcompiler')
| -rw-r--r-- | numpy/distutils/fcompiler/__init__.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/numpy/distutils/fcompiler/__init__.py b/numpy/distutils/fcompiler/__init__.py index 001dea5ec..bd3739a81 100644 --- a/numpy/distutils/fcompiler/__init__.py +++ b/numpy/distutils/fcompiler/__init__.py @@ -22,7 +22,6 @@ import os import sys import re import types -import shlex from numpy.compat import open_latin1 @@ -38,6 +37,7 @@ from numpy.distutils.misc_util import is_string, all_strings, is_sequence, \ make_temp_file, get_shared_lib_extension from numpy.distutils.exec_command import find_executable from numpy.distutils.compat import get_exception +from numpy.distutils import _shell_utils from .environment import EnvironmentConfig @@ -475,10 +475,10 @@ class FCompiler(CCompiler): fixflags = [] if f77: - f77 = shlex.split(f77, posix=(os.name == 'posix')) + f77 = _shell_utils.NativeParser.split(f77) f77flags = self.flag_vars.f77 if f90: - f90 = shlex.split(f90, posix=(os.name == 'posix')) + f90 = _shell_utils.NativeParser.split(f90) f90flags = self.flag_vars.f90 freeflags = self.flag_vars.free # XXX Assuming that free format is default for f90 compiler. @@ -491,7 +491,7 @@ class FCompiler(CCompiler): # should perhaps eventually be more throughly tested and more # robustly handled if fix: - fix = shlex.split(fix, posix=(os.name == 'posix')) + fix = _shell_utils.NativeParser.split(fix) fixflags = self.flag_vars.fix + f90flags oflags, aflags, dflags = [], [], [] |