diff options
author | cookedm <cookedm@localhost> | 2006-03-10 21:19:42 +0000 |
---|---|---|
committer | cookedm <cookedm@localhost> | 2006-03-10 21:19:42 +0000 |
commit | f2db317c1fad63f1c85944ba8443b465e32774dc (patch) | |
tree | d78a7b19f1594f34c86adbdb08389b30a5c95d4d /numpy | |
parent | 3493d8b3cee54037e893fde83f3113a66b0ec7e8 (diff) | |
download | numpy-f2db317c1fad63f1c85944ba8443b465e32774dc.tar.gz |
Run tabnanny over the code, and replace uses of tab for indentation with spaces
Diffstat (limited to 'numpy')
-rw-r--r-- | numpy/core/_internal.py | 4 | ||||
-rw-r--r-- | numpy/core/tests/test_defmatrix.py | 4 | ||||
-rw-r--r-- | numpy/core/tests/test_multiarray.py | 2 | ||||
-rw-r--r-- | numpy/core/tests/test_numeric.py | 24 | ||||
-rw-r--r-- | numpy/distutils/fcompiler/absoft.py | 2 | ||||
-rw-r--r-- | numpy/distutils/system_info.py | 4 | ||||
-rw-r--r-- | numpy/f2py/capi_maps.py | 6 | ||||
-rw-r--r-- | numpy/lib/machar.py | 6 | ||||
-rw-r--r-- | numpy/lib/tests/test_twodim_base.py | 2 |
9 files changed, 27 insertions, 27 deletions
diff --git a/numpy/core/_internal.py b/numpy/core/_internal.py index 1c738a110..0326109c7 100644 --- a/numpy/core/_internal.py +++ b/numpy/core/_internal.py @@ -50,8 +50,8 @@ class flagsobj(dict): if (key == 'FNC'): return (self._flagnum & _fnum == _fnum) and not \ (self._flagnum & _cnum == _cnum) - if (key == 'FORC'): - return (self._flagnum & _fnum == _fnum) or \ + if (key == 'FORC'): + return (self._flagnum & _fnum == _fnum) or \ (self._flagnum & _cnum == _cnum) if (key == 'BEHAVED'): num = _anum + _wnum diff --git a/numpy/core/tests/test_defmatrix.py b/numpy/core/tests/test_defmatrix.py index 48fd6079e..1eb91c8f9 100644 --- a/numpy/core/tests/test_defmatrix.py +++ b/numpy/core/tests/test_defmatrix.py @@ -89,8 +89,8 @@ class test_properties(ScipyTestCase): def check_noaxis(self): A = matrix([[1,0],[0,1]]) - assert A.sum() == matrix(2) - assert A.mean() == matrix(0.5) + assert A.sum() == matrix(2) + assert A.mean() == matrix(0.5) class test_casting(ScipyTestCase): def check_basic(self): diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py index f220a949a..25f2d9964 100644 --- a/numpy/core/tests/test_multiarray.py +++ b/numpy/core/tests/test_multiarray.py @@ -136,7 +136,7 @@ class test_zero_rank(ScipyTestCase): self.failUnlessEqual(a[()], 0) self.failUnlessEqual(b[()], 'x') self.failUnless(type(a[()]) is a.dtype.type) - self.failUnless(type(b[()]) is str) + self.failUnless(type(b[()]) is str) def check_invalid_subscript(self): a,b = self.d diff --git a/numpy/core/tests/test_numeric.py b/numpy/core/tests/test_numeric.py index 4ef040c0b..dbd905546 100644 --- a/numpy/core/tests/test_numeric.py +++ b/numpy/core/tests/test_numeric.py @@ -61,22 +61,22 @@ class test_dot(ScipyTestCase): assert_almost_equal(c1, c2, decimal=self.N) def check_matscalar(self): - b1 = matrix(ones((3,3),dtype=complex)) - assert_equal(b1*1.0, b1) + b1 = matrix(ones((3,3),dtype=complex)) + assert_equal(b1*1.0, b1) def check_columnvect(self): - b1 = ones((3,1)) - b2 = [5.3] - c1 = dot(b1,b2) - c2 = dot_(b1,b2) - assert_almost_equal(c1, c2, decimal=self.N) + b1 = ones((3,1)) + b2 = [5.3] + c1 = dot(b1,b2) + c2 = dot_(b1,b2) + assert_almost_equal(c1, c2, decimal=self.N) def check_columnvect(self): - b1 = ones((3,1)).transpose() - b2 = [6.2] - c1 = dot(b2,b1) - c2 = dot_(b2,b1) - assert_almost_equal(c1, c2, decimal=self.N) + b1 = ones((3,1)).transpose() + b2 = [6.2] + c1 = dot(b2,b1) + c2 = dot_(b2,b1) + assert_almost_equal(c1, c2, decimal=self.N) diff --git a/numpy/distutils/fcompiler/absoft.py b/numpy/distutils/fcompiler/absoft.py index 31ae2c772..ed67ff3dc 100644 --- a/numpy/distutils/fcompiler/absoft.py +++ b/numpy/distutils/fcompiler/absoft.py @@ -74,7 +74,7 @@ class AbsoftFCompiler(FCompiler): def get_libraries(self): opt = FCompiler.get_libraries(self) if self.get_version() >= '8.0': - opt.extend(['f90math','fio','f77math','U77']) + opt.extend(['f90math','fio','f77math','U77']) else: opt.extend(['fio','f90math','fmath','U77']) if os.name =='nt': diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py index ce44fd05b..20dc7292a 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -1172,8 +1172,8 @@ class lapack_opt_info(system_info): else: atlas_info['define_macros'].append(('ATLAS_INFO', '"\\"%s\\""' % atlas_version)) - if atlas_version=='3.2.1_pre3.3.6': - atlas_info['define_macros'].append(('NO_ATLAS_INFO',4)) + if atlas_version=='3.2.1_pre3.3.6': + atlas_info['define_macros'].append(('NO_ATLAS_INFO',4)) l = atlas_info.get('define_macros',[]) if ('ATLAS_WITH_LAPACK_ATLAS',None) in l \ or ('ATLAS_WITHOUT_LAPACK',None) in l: diff --git a/numpy/f2py/capi_maps.py b/numpy/f2py/capi_maps.py index 123fe7ed8..19ebaa15c 100644 --- a/numpy/f2py/capi_maps.py +++ b/numpy/f2py/capi_maps.py @@ -392,8 +392,8 @@ def getinit(a,var): init=var['='] showinit=init if iscomplex(var) or iscomplexarray(var): - ret={} - + ret={} + try: v = var["="] if ',' in v: @@ -442,7 +442,7 @@ def sign2map(a,var): else: ret['varrformat']='O' ret['init'],ret['showinit']=getinit(a,var) if hasinitvalue(var) and iscomplex(var) and not isarray(var): - ret['init.r'],ret['init.i'] = string.split(markoutercomma(ret['init'][1:-1]),'@,@') + ret['init.r'],ret['init.i'] = string.split(markoutercomma(ret['init'][1:-1]),'@,@') if isexternal(var): ret['cbnamekey']=a if lcb_map.has_key(a): diff --git a/numpy/lib/machar.py b/numpy/lib/machar.py index 894623e82..249dfddad 100644 --- a/numpy/lib/machar.py +++ b/numpy/lib/machar.py @@ -123,10 +123,10 @@ class MachAr(object): break a = a * beta negep = negep - 1 - # Prevent infinite loop on PPC with gcc 4.0: - if negep < 0: + # Prevent infinite loop on PPC with gcc 4.0: + if negep < 0: raise RuntimeError, "could not determine machine tolerance " \ - "for 'negep', locals() -> %s" % (locals()) + "for 'negep', locals() -> %s" % (locals()) negep = -negep epsneg = a diff --git a/numpy/lib/tests/test_twodim_base.py b/numpy/lib/tests/test_twodim_base.py index 4213078c5..e32f29478 100644 --- a/numpy/lib/tests/test_twodim_base.py +++ b/numpy/lib/tests/test_twodim_base.py @@ -19,7 +19,7 @@ def get_mat(n): class test_eye(ScipyTestCase): def check_basic(self): - assert_equal(eye(4),array([[1,0,0,0], + assert_equal(eye(4),array([[1,0,0,0], [0,1,0,0], [0,0,1,0], [0,0,0,1]])) |