diff options
| author | Julian Taylor <juliantaylor108@gmail.com> | 2014-11-20 00:25:29 +0100 |
|---|---|---|
| committer | Julian Taylor <juliantaylor108@gmail.com> | 2014-11-20 00:25:29 +0100 |
| commit | 8bcb7569c92dc94d5b1516e7d33608bbd041a6bf (patch) | |
| tree | 810e8ac1cd074ec89b1e37ac96d2036635b32114 /numpy | |
| parent | 68ffaec50976461c32a98570821dd2d05d53c2fe (diff) | |
| parent | 6ceb0e60493814113dc9d07f450fc8fa058e9462 (diff) | |
| download | numpy-8bcb7569c92dc94d5b1516e7d33608bbd041a6bf.tar.gz | |
Merge pull request #5296 from alimuldal/fix_parallel_extensions_njobs
BUG: getattr() raises AttributeError in get_num_jobs() when --jobs argument not given
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/distutils/misc_util.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py index cab0a4cba..19103f2c1 100644 --- a/numpy/distutils/misc_util.py +++ b/numpy/distutils/misc_util.py @@ -87,9 +87,9 @@ def get_num_build_jobs(): return envjobs # any of these three may have the job set, take the largest - cmdattr = (getattr(dist.get_command_obj('build'), 'jobs'), - getattr(dist.get_command_obj('build_ext'), 'jobs'), - getattr(dist.get_command_obj('build_clib'), 'jobs')) + cmdattr = (getattr(dist.get_command_obj('build'), 'jobs', None), + getattr(dist.get_command_obj('build_ext'), 'jobs', None), + getattr(dist.get_command_obj('build_clib'), 'jobs', None)) if all(x is None for x in cmdattr): return envjobs else: |