diff options
| author | Jarrod Millman <millman@berkeley.edu> | 2007-10-29 14:58:18 +0000 |
|---|---|---|
| committer | Jarrod Millman <millman@berkeley.edu> | 2007-10-29 14:58:18 +0000 |
| commit | 0b77f0e5f0e46b2ef7c570ebda046c34bbcc0f26 (patch) | |
| tree | c7609a2a685fd5bff235d812b8c5705621216f4c /numpy/distutils | |
| parent | aa3c27cce3d0625f719b812c9e6b0aa73114c612 (diff) | |
| download | numpy-0b77f0e5f0e46b2ef7c570ebda046c34bbcc0f26.tar.gz | |
ran reindent.py to clean up whitespace
Diffstat (limited to 'numpy/distutils')
| -rw-r--r-- | numpy/distutils/ccompiler.py | 2 | ||||
| -rw-r--r-- | numpy/distutils/command/build_src.py | 2 | ||||
| -rw-r--r-- | numpy/distutils/command/config.py | 1 | ||||
| -rw-r--r-- | numpy/distutils/core.py | 28 | ||||
| -rw-r--r-- | numpy/distutils/fcompiler/__init__.py | 2 | ||||
| -rw-r--r-- | numpy/distutils/misc_util.py | 2 | ||||
| -rw-r--r-- | numpy/distutils/system_info.py | 4 |
7 files changed, 20 insertions, 21 deletions
diff --git a/numpy/distutils/ccompiler.py b/numpy/distutils/ccompiler.py index 593833a76..b6cb1eb57 100644 --- a/numpy/distutils/ccompiler.py +++ b/numpy/distutils/ccompiler.py @@ -217,7 +217,7 @@ def CCompiler_customize(self, dist, need_cxx=0): + self.compiler[1:] else: if hasattr(self,'compiler'): - log.warn("#### %s #######" % (self.compiler,)) + log.warn("#### %s #######" % (self.compiler,)) log.warn('Missing compiler_cxx fix for '+self.__class__.__name__) return diff --git a/numpy/distutils/command/build_src.py b/numpy/distutils/command/build_src.py index d634d4420..8b1e7fe7a 100644 --- a/numpy/distutils/command/build_src.py +++ b/numpy/distutils/command/build_src.py @@ -116,7 +116,7 @@ class build_src(build_ext.build_ext): self.swig_cpp = build_ext.swig_cpp for c in ['swig','swig_opt']: o = '--'+c.replace('_','-') - v = getattr(build_ext,c,None) + v = getattr(build_ext,c,None) if v: if getattr(self,c): log.warn('both build_src and build_ext define %s option' % (o)) diff --git a/numpy/distutils/command/config.py b/numpy/distutils/command/config.py index 11d630993..41c8f4f02 100644 --- a/numpy/distutils/command/config.py +++ b/numpy/distutils/command/config.py @@ -156,4 +156,3 @@ class config(old_config): self._clean() return exitcode, output - diff --git a/numpy/distutils/core.py b/numpy/distutils/core.py index 5e2ab408b..a17e3fe50 100644 --- a/numpy/distutils/core.py +++ b/numpy/distutils/core.py @@ -98,23 +98,23 @@ def get_distribution(always=False): dist = distutils.dist.Distribution() return dist -def _exit_interactive_session(_cache=[]): - if _cache: - return # been here - _cache.append(1) - print '-'*72 - raw_input('Press ENTER to close the interactive session..') - print '='*72 +def _exit_interactive_session(_cache=[]): + if _cache: + return # been here + _cache.append(1) + print '-'*72 + raw_input('Press ENTER to close the interactive session..') + print '='*72 def setup(**attr): - if len(sys.argv)<=1 and not attr.get('script_args',[]): - from interactive import interactive_sys_argv - import atexit - atexit.register(_exit_interactive_session) - sys.argv[:] = interactive_sys_argv(sys.argv) - if len(sys.argv)>1: - return setup(**attr) + if len(sys.argv)<=1 and not attr.get('script_args',[]): + from interactive import interactive_sys_argv + import atexit + atexit.register(_exit_interactive_session) + sys.argv[:] = interactive_sys_argv(sys.argv) + if len(sys.argv)>1: + return setup(**attr) cmdclass = numpy_cmdclass.copy() diff --git a/numpy/distutils/fcompiler/__init__.py b/numpy/distutils/fcompiler/__init__.py index 3ef88f229..039d6fba8 100644 --- a/numpy/distutils/fcompiler/__init__.py +++ b/numpy/distutils/fcompiler/__init__.py @@ -207,7 +207,7 @@ class FCompiler(CCompiler): # This will be set by new_fcompiler when called in # command/{build_ext.py, build_clib.py, config.py} files. c_compiler = None - + def __init__(self, *args, **kw): CCompiler.__init__(self, *args, **kw) self.distutils_vars = self.distutils_vars.clone(self._environment_hook) diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py index ca2b5204d..6f7dd1d83 100644 --- a/numpy/distutils/misc_util.py +++ b/numpy/distutils/misc_util.py @@ -1519,7 +1519,7 @@ else: #copied from python 2.5.1 distutils/msvccompiler.py def get_build_architecture(): """Return the processor architecture. - + Possible results are "Intel", "Itanium", or "AMD64". """ prefix = " bit (" diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py index c68308690..431180d4a 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -841,7 +841,7 @@ class lapack_mkl_info(mkl_info): lapack_libs = self.get_libs('lapack_libs',['mkl_lapack']) else: lapack_libs = self.get_libs('lapack_libs',['mkl_lapack32','mkl_lapack64']) - + info = {'libraries': lapack_libs} dict_append(info,**mkl) self.set_info(**info) @@ -1083,7 +1083,7 @@ class lapack_src_info(system_info): tgexc tgsen tgsja tgsna tgsy2 tgsyl tpcon tprfs tptri tptrs trcon trevc trexc trrfs trsen trsna trsyl trti2 trtri trtrs tzrqf tzrzf - + lacn2 lahr2 stemr laqr0 laqr1 laqr2 laqr3 laqr4 laqr5 ''' # [s|c|d|z]*.f sd_lasrc = ''' |
