diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2015-07-05 11:47:29 -0600 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2015-07-05 12:18:26 -0600 |
commit | 8b3e9ae5262c1da1118370cd6e83db9b2166952e (patch) | |
tree | ad552d92d8f806db622da102707571a38faec7c2 /numpy/core/numeric.py | |
parent | c2ae6aa0103aecdb5e2a71504583451cada1bfbc (diff) | |
download | numpy-8b3e9ae5262c1da1118370cd6e83db9b2166952e.tar.gz |
STY: PEP8 fixes for numpy/core/*.py
Diffstat (limited to 'numpy/core/numeric.py')
-rw-r--r-- | numpy/core/numeric.py | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index f7b0f49fa..c31c5f75f 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -826,8 +826,8 @@ def flatnonzero(a): return a.ravel().nonzero()[0] _mode_from_name_dict = {'v': 0, - 's' : 1, - 'f' : 2} + 's': 1, + 'f': 2} def _mode_from_name(mode): if isinstance(mode, basestring): @@ -991,9 +991,9 @@ def convolve(a,v,mode='full'): a, v = array(a, copy=False, ndmin=1), array(v, copy=False, ndmin=1) if (len(v) > len(a)): a, v = v, a - if len(a) == 0 : + if len(a) == 0: raise ValueError('a cannot be empty') - if len(v) == 0 : + if len(v) == 0: raise ValueError('v cannot be empty') mode = _mode_from_name(mode) return multiarray.correlate(a, v[::-1], mode) @@ -1281,7 +1281,8 @@ def tensordot(a, b, axes=2): bs = b.shape ndb = len(b.shape) equal = True - if (na != nb): equal = False + if (na != nb): + equal = False else: for k in range(na): if as_[axes_a[k]] != bs[axes_b[k]]: @@ -1701,14 +1702,14 @@ def array_repr(arr, max_line_width=None, precision=None, suppress_small=None): 'array([ 0.000001, 0. , 2. , 3. ])' """ - if arr.size > 0 or arr.shape==(0,): + if arr.size > 0 or arr.shape == (0,): lst = array2string(arr, max_line_width, precision, suppress_small, ', ', "array(") - else: # show zero-length shape unless it is (0,) + else: # show zero-length shape unless it is (0,) lst = "[], shape=%s" % (repr(arr.shape),) if arr.__class__ is not ndarray: - cName= arr.__class__.__name__ + cName = arr.__class__.__name__ else: cName = "array" @@ -1900,7 +1901,7 @@ def indices(dimensions, dtype=int): for i, dim in enumerate(dimensions): tmp = arange(dim, dtype=dtype) tmp.shape = (1,)*i + (dim,)+(1,)*(N-i-1) - newdim = dimensions[:i] + (1,)+ dimensions[i+1:] + newdim = dimensions[:i] + (1,) + dimensions[i+1:] val = zeros(newdim, dtype) add(tmp, val, res[i]) return res @@ -2548,13 +2549,17 @@ def seterr(all=None, divide=None, over=None, under=None, invalid=None): pyvals = umath.geterrobj() old = geterr() - if divide is None: divide = all or old['divide'] - if over is None: over = all or old['over'] - if under is None: under = all or old['under'] - if invalid is None: invalid = all or old['invalid'] + if divide is None: + divide = all or old['divide'] + if over is None: + over = all or old['over'] + if under is None: + under = all or old['under'] + if invalid is None: + invalid = all or old['invalid'] maskvalue = ((_errdict[divide] << SHIFT_DIVIDEBYZERO) + - (_errdict[over] << SHIFT_OVERFLOW ) + + (_errdict[over] << SHIFT_OVERFLOW) + (_errdict[under] << SHIFT_UNDERFLOW) + (_errdict[invalid] << SHIFT_INVALID)) @@ -2626,9 +2631,9 @@ def setbufsize(size): if size > 10e6: raise ValueError("Buffer size, %s, is too big." % size) if size < 5: - raise ValueError("Buffer size, %s, is too small." %size) + raise ValueError("Buffer size, %s, is too small." % size) if size % 16 != 0: - raise ValueError("Buffer size, %s, is not a multiple of 16." %size) + raise ValueError("Buffer size, %s, is not a multiple of 16." % size) pyvals = umath.geterrobj() old = getbufsize() @@ -2849,6 +2854,7 @@ class errstate(object): """ # Note that we don't want to run the above doctests because they will fail # without a from __future__ import with_statement + def __init__(self, **kwargs): self.call = kwargs.pop('call', _Unspecified) self.kwargs = kwargs |