summaryrefslogtreecommitdiff
path: root/numpy/distutils/ccompiler.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-08-18 11:51:25 -0600
committerCharles Harris <charlesr.harris@gmail.com>2013-08-18 11:51:25 -0600
commitfbd6510d58a47ea0d166c48a82793f05425406e4 (patch)
tree330ce703eb02d20f96099c3fe0fc36ae33d4905b /numpy/distutils/ccompiler.py
parent8ddb0ce0acafe75d78df528b4d2540dfbf4b364d (diff)
downloadnumpy-fbd6510d58a47ea0d166c48a82793f05425406e4.tar.gz
STY: Giant comma spacing fixup.
Run the 2to3 ws_comma fixer on *.py files. Some lines are now too long and will need to be broken at some point. OTOH, some lines were already too long and need to be broken at some point. Now seems as good a time as any to do this with open PRs at a minimum.
Diffstat (limited to 'numpy/distutils/ccompiler.py')
-rw-r--r--numpy/distutils/ccompiler.py60
1 files changed, 30 insertions, 30 deletions
diff --git a/numpy/distutils/ccompiler.py b/numpy/distutils/ccompiler.py
index 48f6f09b6..8484685c0 100644
--- a/numpy/distutils/ccompiler.py
+++ b/numpy/distutils/ccompiler.py
@@ -56,7 +56,7 @@ def CCompiler_spawn(self, cmd, display=None):
if is_sequence(display):
display = ' '.join(list(display))
log.info(display)
- s,o = exec_command(cmd)
+ s, o = exec_command(cmd)
if s:
if is_sequence(cmd):
cmd = ' '.join(list(cmd))
@@ -114,7 +114,7 @@ def CCompiler_object_filenames(self, source_filenames, strip_dir=0, output_dir='
raise UnknownFileError("unknown file type '%s' (from '%s')" % (ext, src_name))
if strip_dir:
base = os.path.basename(base)
- obj_name = os.path.join(output_dir,base + self.obj_extension)
+ obj_name = os.path.join(output_dir, base + self.obj_extension)
obj_names.append(obj_name)
return obj_names
@@ -170,8 +170,8 @@ def CCompiler_compile(self, sources, output_dir=None, macros=None,
from numpy.distutils.fcompiler import FCompiler
if isinstance(self, FCompiler):
display = []
- for fc in ['f77','f90','fix']:
- fcomp = getattr(self,'compiler_'+fc)
+ for fc in ['f77', 'f90', 'fix']:
+ fcomp = getattr(self, 'compiler_'+fc)
if fcomp is None:
continue
display.append("Fortran %s compiler: %s" % (fc, ' '.join(fcomp)))
@@ -236,7 +236,7 @@ def CCompiler_customize_cmd(self, cmd, ignore=()):
if allow('include_dirs'):
self.set_include_dirs(cmd.include_dirs)
if allow('define'):
- for (name,value) in cmd.define:
+ for (name, value) in cmd.define:
self.define_macro(name, value)
if allow('undef'):
for macro in cmd.undef:
@@ -256,16 +256,16 @@ def _compiler_to_string(compiler):
props = []
mx = 0
keys = list(compiler.executables.keys())
- for key in ['version','libraries','library_dirs',
- 'object_switch','compile_switch',
- 'include_dirs','define','undef','rpath','link_objects']:
+ for key in ['version', 'libraries', 'library_dirs',
+ 'object_switch', 'compile_switch',
+ 'include_dirs', 'define', 'undef', 'rpath', 'link_objects']:
if key not in keys:
keys.append(key)
for key in keys:
- if hasattr(compiler,key):
+ if hasattr(compiler, key):
v = getattr(compiler, key)
- mx = max(mx,len(key))
- props.append((key,repr(v)))
+ mx = max(mx, len(key))
+ props.append((key, repr(v)))
lines = []
format = '%-' + repr(mx+1) + 's = %s'
for prop in props:
@@ -290,13 +290,13 @@ def CCompiler_show_customization(self):
"""
if 0:
- for attrname in ['include_dirs','define','undef',
- 'libraries','library_dirs',
- 'rpath','link_objects']:
- attr = getattr(self,attrname,None)
+ for attrname in ['include_dirs', 'define', 'undef',
+ 'libraries', 'library_dirs',
+ 'rpath', 'link_objects']:
+ attr = getattr(self, attrname, None)
if not attr:
continue
- log.info("compiler '%s' is set to %s" % (attrname,attr))
+ log.info("compiler '%s' is set to %s" % (attrname, attr))
try:
self.get_version()
except:
@@ -351,16 +351,16 @@ def CCompiler_customize(self, dist, need_cxx=0):
except (AttributeError, ValueError):
pass
- if hasattr(self,'compiler') and 'cc' in self.compiler[0]:
+ if hasattr(self, 'compiler') and 'cc' in self.compiler[0]:
if not self.compiler_cxx:
if self.compiler[0].startswith('gcc'):
a, b = 'gcc', 'g++'
else:
a, b = 'cc', 'c++'
- self.compiler_cxx = [self.compiler[0].replace(a,b)]\
+ self.compiler_cxx = [self.compiler[0].replace(a, b)]\
+ self.compiler[1:]
else:
- if hasattr(self,'compiler'):
+ if hasattr(self, 'compiler'):
log.warn("#### %s #######" % (self.compiler,))
log.warn('Missing compiler_cxx fix for '+self.__class__.__name__)
return
@@ -396,7 +396,7 @@ def simple_version_match(pat=r'[-.\d]+', ignore='', start=''):
def matcher(self, version_string):
# version string may appear in the second line, so getting rid
# of new lines:
- version_string = version_string.replace('\n',' ')
+ version_string = version_string.replace('\n', ' ')
pos = 0
if start:
m = re.match(start, version_string)
@@ -434,7 +434,7 @@ def CCompiler_get_version(self, force=False, ok_status=[0]):
Version string, in the format of `distutils.version.LooseVersion`.
"""
- if not force and hasattr(self,'version'):
+ if not force and hasattr(self, 'version'):
return self.version
self.find_executables()
try:
@@ -457,7 +457,7 @@ def CCompiler_get_version(self, force=False, ok_status=[0]):
version = m.group('version')
return version
- status, output = exec_command(version_cmd,use_tee=0)
+ status, output = exec_command(version_cmd, use_tee=0)
version = None
if status in ok_status:
@@ -496,18 +496,18 @@ def CCompiler_cxx_compiler(self):
replace_method(CCompiler, 'cxx_compiler', CCompiler_cxx_compiler)
-compiler_class['intel'] = ('intelccompiler','IntelCCompiler',
+compiler_class['intel'] = ('intelccompiler', 'IntelCCompiler',
"Intel C Compiler for 32-bit applications")
-compiler_class['intele'] = ('intelccompiler','IntelItaniumCCompiler',
+compiler_class['intele'] = ('intelccompiler', 'IntelItaniumCCompiler',
"Intel C Itanium Compiler for Itanium-based applications")
-compiler_class['intelem'] = ('intelccompiler','IntelEM64TCCompiler',
+compiler_class['intelem'] = ('intelccompiler', 'IntelEM64TCCompiler',
"Intel C Compiler for 64-bit applications")
-compiler_class['pathcc'] = ('pathccompiler','PathScaleCCompiler',
+compiler_class['pathcc'] = ('pathccompiler', 'PathScaleCCompiler',
"PathScale Compiler for SiCortex-based applications")
-ccompiler._default_compilers += (('linux.*','intel'),
- ('linux.*','intele'),
- ('linux.*','intelem'),
- ('linux.*','pathcc'))
+ccompiler._default_compilers += (('linux.*', 'intel'),
+ ('linux.*', 'intele'),
+ ('linux.*', 'intelem'),
+ ('linux.*', 'pathcc'))
if sys.platform == 'win32':
compiler_class['mingw32'] = ('mingw32ccompiler', 'Mingw32CCompiler',