summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornjsmith <njs@pobox.com>2012-09-17 09:17:47 -0700
committernjsmith <njs@pobox.com>2012-09-17 09:17:47 -0700
commit58aefff1ab5a23a42db29479bc05cc93237588e1 (patch)
tree2c602b456445b1862004009164477e4e597c78ce
parentccbf5cf2fc35ec0a3e2c184fb846bb808aee3610 (diff)
parent0ab86f0073faf3ff6e22902f8c45e41f62e0f703 (diff)
downloadnumpy-58aefff1ab5a23a42db29479bc05cc93237588e1.tar.gz
Merge pull request #446 from cgohlke/patch-1
Style: consistently use spaces instead of tabs in .py files
-rw-r--r--numpy/build_utils/waf.py4
-rw-r--r--numpy/distutils/fcompiler/gnu.py2
-rw-r--r--numpy/distutils/fcompiler/pathf95.py52
3 files changed, 29 insertions, 29 deletions
diff --git a/numpy/build_utils/waf.py b/numpy/build_utils/waf.py
index ab49ecea9..4ef71327c 100644
--- a/numpy/build_utils/waf.py
+++ b/numpy/build_utils/waf.py
@@ -123,9 +123,9 @@ int main()
def check_type(self, type_name, **kw):
code = r"""
int main() {
- if ((%(type_name)s *) 0)
+ if ((%(type_name)s *) 0)
return 0;
- if (sizeof (%(type_name)s))
+ if (sizeof (%(type_name)s))
return 0;
}
""" % {"type_name": type_name}
diff --git a/numpy/distutils/fcompiler/gnu.py b/numpy/distutils/fcompiler/gnu.py
index 49df885b6..bb832991f 100644
--- a/numpy/distutils/fcompiler/gnu.py
+++ b/numpy/distutils/fcompiler/gnu.py
@@ -251,7 +251,7 @@ class Gnu95FCompiler(GnuFCompiler):
executables = {
'version_cmd' : ["<F90>", "--version"],
'compiler_f77' : [None, "-Wall", "-ffixed-form",
- "-fno-second-underscore"] + _EXTRAFLAGS,
+ "-fno-second-underscore"] + _EXTRAFLAGS,
'compiler_f90' : [None, "-Wall", "-fno-second-underscore"] + _EXTRAFLAGS,
'compiler_fix' : [None, "-Wall", "-ffixed-form",
"-fno-second-underscore"] + _EXTRAFLAGS,
diff --git a/numpy/distutils/fcompiler/pathf95.py b/numpy/distutils/fcompiler/pathf95.py
index c92653ba7..29881f4cf 100644
--- a/numpy/distutils/fcompiler/pathf95.py
+++ b/numpy/distutils/fcompiler/pathf95.py
@@ -4,33 +4,33 @@ compilers = ['PathScaleFCompiler']
class PathScaleFCompiler(FCompiler):
- compiler_type = 'pathf95'
- description = 'PathScale Fortran Compiler'
- version_pattern = r'PathScale\(TM\) Compiler Suite: Version (?P<version>[\d.]+)'
+ compiler_type = 'pathf95'
+ description = 'PathScale Fortran Compiler'
+ version_pattern = r'PathScale\(TM\) Compiler Suite: Version (?P<version>[\d.]+)'
- executables = {
- 'version_cmd' : ["pathf95", "-version"],
- 'compiler_f77' : ["pathf95", "-fixedform"],
- 'compiler_fix' : ["pathf95", "-fixedform"],
- 'compiler_f90' : ["pathf95"],
- 'linker_so' : ["pathf95", "-shared"],
- 'archiver' : ["ar", "-cr"],
- 'ranlib' : ["ranlib"]
- }
- pic_flags = ['-fPIC']
- module_dir_switch = '-module ' # Don't remove ending space!
- module_include_switch = '-I'
+ executables = {
+ 'version_cmd' : ["pathf95", "-version"],
+ 'compiler_f77' : ["pathf95", "-fixedform"],
+ 'compiler_fix' : ["pathf95", "-fixedform"],
+ 'compiler_f90' : ["pathf95"],
+ 'linker_so' : ["pathf95", "-shared"],
+ 'archiver' : ["ar", "-cr"],
+ 'ranlib' : ["ranlib"]
+ }
+ pic_flags = ['-fPIC']
+ module_dir_switch = '-module ' # Don't remove ending space!
+ module_include_switch = '-I'
- def get_flags_opt(self):
- return ['-O3']
- def get_flags_debug(self):
- return ['-g']
+ def get_flags_opt(self):
+ return ['-O3']
+ def get_flags_debug(self):
+ return ['-g']
if __name__ == '__main__':
- from distutils import log
- log.set_verbosity(2)
- #compiler = PathScaleFCompiler()
- from numpy.distutils.fcompiler import new_fcompiler
- compiler = new_fcompiler(compiler='pathf95')
- compiler.customize()
- print compiler.get_version()
+ from distutils import log
+ log.set_verbosity(2)
+ #compiler = PathScaleFCompiler()
+ from numpy.distutils.fcompiler import new_fcompiler
+ compiler = new_fcompiler(compiler='pathf95')
+ compiler.customize()
+ print compiler.get_version()