summaryrefslogtreecommitdiff
path: root/numpy/lib/shape_base.py
diff options
context:
space:
mode:
authorjurnix <albert.jornet@ic3.cat>2014-06-06 10:40:32 +0200
committerjurnix <albert.jornet@ic3.cat>2014-06-06 10:40:32 +0200
commit7f8aae032a218ed609e23068d5aec128b0d6fe8e (patch)
treebd3e50d002a6b9a513f5665eb5a2d9a2bb21235d /numpy/lib/shape_base.py
parentddc95d379f410c7ff787c157ded6c40bb873215c (diff)
downloadnumpy-7f8aae032a218ed609e23068d5aec128b0d6fe8e.tar.gz
PEP8 nitpicks
Diffstat (limited to 'numpy/lib/shape_base.py')
-rw-r--r--numpy/lib/shape_base.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/numpy/lib/shape_base.py b/numpy/lib/shape_base.py
index 31232c989..eb0a041a6 100644
--- a/numpy/lib/shape_base.py
+++ b/numpy/lib/shape_base.py
@@ -12,7 +12,7 @@ from numpy.core.numeric import asarray, zeros, newaxis, outer, \
from numpy.core.fromnumeric import product, reshape
from numpy.core import hstack, vstack, atleast_3d
-def apply_along_axis(func1d,axis,arr,*args,**kwargs):
+def apply_along_axis(func1d, axis, arr, *args, **kwargs):
"""
Apply a function to 1-D slices along the given axis.
@@ -33,6 +33,9 @@ def apply_along_axis(func1d,axis,arr,*args,**kwargs):
kwargs: any
Additional named arguments to `func1d`.
+ .. versionadded:: 1.9.0
+
+
Returns
-------
apply_along_axis : ndarray
@@ -80,7 +83,7 @@ def apply_along_axis(func1d,axis,arr,*args,**kwargs):
i[axis] = slice(None, None)
outshape = asarray(arr.shape).take(indlist)
i.put(indlist, ind)
- res = func1d(arr[tuple(i.tolist())],*args,**kwargs)
+ res = func1d(arr[tuple(i.tolist())], *args, **kwargs)
# if res is a number, then we have a smaller output array
if isscalar(res):
outarr = zeros(outshape, asarray(res).dtype)
@@ -96,7 +99,7 @@ def apply_along_axis(func1d,axis,arr,*args,**kwargs):
ind[n] = 0
n -= 1
i.put(indlist, ind)
- res = func1d(arr[tuple(i.tolist())],*args,**kwargs)
+ res = func1d(arr[tuple(i.tolist())], *args, **kwargs)
outarr[tuple(ind)] = res
k += 1
return outarr
@@ -117,7 +120,7 @@ def apply_along_axis(func1d,axis,arr,*args,**kwargs):
ind[n] = 0
n -= 1
i.put(indlist, ind)
- res = func1d(arr[tuple(i.tolist())],*args,**kwargs)
+ res = func1d(arr[tuple(i.tolist())], *args, **kwargs)
outarr[tuple(i.tolist())] = res
k += 1
return outarr