diff options
author | Stefan van der Walt <stefan@sun.ac.za> | 2009-04-16 17:32:23 +0000 |
---|---|---|
committer | Stefan van der Walt <stefan@sun.ac.za> | 2009-04-16 17:32:23 +0000 |
commit | 37abe7a2f64dbd5dffee0d5abd5784b15191d9a5 (patch) | |
tree | 665e1faacc77c8138b3f74648d2e27ba74ec4a28 | |
parent | 9c5ec967cf50b3c498980650bf6a132b1516171a (diff) | |
download | numpy-37abe7a2f64dbd5dffee0d5abd5784b15191d9a5.tar.gz |
Remove tabs and unnecessary whitespace.
-rw-r--r-- | numpy/core/setup.py | 6 | ||||
-rw-r--r-- | numpy/core/tests/test_scalarmath.py | 6 | ||||
-rw-r--r-- | numpy/distutils/command/build_ext.py | 8 | ||||
-rw-r--r-- | numpy/distutils/fcompiler/compaq.py | 4 | ||||
-rw-r--r-- | numpy/distutils/misc_util.py | 4 |
5 files changed, 14 insertions, 14 deletions
diff --git a/numpy/core/setup.py b/numpy/core/setup.py index 702a87433..9b123435a 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -481,7 +481,7 @@ def configuration(parent_package='',top_path=None): # (don't ask). Because clib are generated before extensions, we have to # explicitly add an extension which has generate_config_h and # generate_numpyconfig_h as sources *before* adding npymath. - config.add_library('npymath', + config.add_library('npymath', sources=[join('src', 'npy_math.c.src')], depends=[]) @@ -544,8 +544,8 @@ def configuration(parent_package='',top_path=None): extra_info = blas_info ) - config.add_extension('umath_tests', - sources = [join('src','umath_tests.c.src')]) + config.add_extension('umath_tests', + sources = [join('src','umath_tests.c.src')]) config.add_data_dir('tests') config.add_data_dir('tests/data') diff --git a/numpy/core/tests/test_scalarmath.py b/numpy/core/tests/test_scalarmath.py index c04e00a5a..520b6eb17 100644 --- a/numpy/core/tests/test_scalarmath.py +++ b/numpy/core/tests/test_scalarmath.py @@ -102,10 +102,10 @@ class TestRepr(TestCase): assert_equal(val, val2) def test_float_repr(self): - # long double test cannot work, because eval goes through a python - # float + # long double test cannot work, because eval goes through a python + # float for t in [np.float32, np.float64]: - yield test_float_repr, t + yield test_float_repr, t if __name__ == "__main__": run_module_suite() diff --git a/numpy/distutils/command/build_ext.py b/numpy/distutils/command/build_ext.py index c47357808..2b114d4a7 100644 --- a/numpy/distutils/command/build_ext.py +++ b/numpy/distutils/command/build_ext.py @@ -409,10 +409,10 @@ class build_ext (old_build_ext): build_temp=self.build_temp,**kws) def _add_dummy_mingwex_sym(self, c_sources): - build_src = self.get_finalized_command("build_src").build_src - build_clib = self.get_finalized_command("build_clib").build_clib - objects = self.compiler.compile([os.path.join(build_src, - "gfortran_vs2003_hack.c")], + build_src = self.get_finalized_command("build_src").build_src + build_clib = self.get_finalized_command("build_clib").build_clib + objects = self.compiler.compile([os.path.join(build_src, + "gfortran_vs2003_hack.c")], output_dir=self.build_temp) self.compiler.create_static_lib(objects, "_gfortran_workaround", output_dir=build_clib, debug=self.debug) diff --git a/numpy/distutils/fcompiler/compaq.py b/numpy/distutils/fcompiler/compaq.py index 710752b49..60579daf9 100644 --- a/numpy/distutils/fcompiler/compaq.py +++ b/numpy/distutils/fcompiler/compaq.py @@ -79,7 +79,7 @@ class CompaqVisualFCompiler(FCompiler): m.initialize() ar_exe = m.lib except DistutilsPlatformError, msg: - pass + pass except AttributeError, msg: if '_MSVCCompiler__root' in str(msg): print 'Ignoring "%s" (I think it is msvccompiler.py bug)' % (msg) @@ -90,7 +90,7 @@ class CompaqVisualFCompiler(FCompiler): print "Unexpected IOError in", __file__ raise e except ValueError, e: - if not "path']" in str(e): + if not "path']" in str(e): print "Unexpected ValueError in", __file__ raise e diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py index c027b6c6c..210342dc0 100644 --- a/numpy/distutils/misc_util.py +++ b/numpy/distutils/misc_util.py @@ -1636,8 +1636,8 @@ def msvc_version(compiler): """Return version major and minor of compiler instance if it is MSVC, raise an exception otherwise.""" if not compiler.compiler_type == "msvc": - raise ValueError("Compiler instance is not msvc (%s)"\ - % compiler.compiler_type) + raise ValueError("Compiler instance is not msvc (%s)"\ + % compiler.compiler_type) return compiler._MSVCCompiler__version if sys.version[:3] >= '2.5': |