summaryrefslogtreecommitdiff
path: root/numpy/lib/twodim_base.py
diff options
context:
space:
mode:
authorTravis E. Oliphant <teoliphant@gmail.com>2012-06-21 01:37:01 -0700
committerTravis E. Oliphant <teoliphant@gmail.com>2012-06-21 01:37:01 -0700
commit134174c9265dd87ea802c89cac7a89478e3184f4 (patch)
tree5ec76af2359d8b038175fc2df3754c642c708805 /numpy/lib/twodim_base.py
parent651ef74c4ebe7d24e727fd444b1985117ef16fae (diff)
parent3626d0c4fe510d615ef3e5ef3cf4ed2bfb52b53e (diff)
downloadnumpy-134174c9265dd87ea802c89cac7a89478e3184f4.tar.gz
Merge pull request #297 from njsmith/separate-maskna
Split maskna support out of mainline into a branch
Diffstat (limited to 'numpy/lib/twodim_base.py')
-rw-r--r--numpy/lib/twodim_base.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/numpy/lib/twodim_base.py b/numpy/lib/twodim_base.py
index eab8f867a..c1f75c630 100644
--- a/numpy/lib/twodim_base.py
+++ b/numpy/lib/twodim_base.py
@@ -166,7 +166,7 @@ def rot90(m, k=1):
# k == 3
return fliplr(m.swapaxes(0,1))
-def eye(N, M=None, k=0, dtype=float, maskna=False):
+def eye(N, M=None, k=0, dtype=float):
"""
Return a 2-D array with ones on the diagonal and zeros elsewhere.
@@ -182,8 +182,6 @@ def eye(N, M=None, k=0, dtype=float, maskna=False):
to a lower diagonal.
dtype : data-type, optional
Data-type of the returned array.
- maskna : boolean
- If this is true, the returned array will have an NA mask.
Returns
-------
@@ -209,7 +207,7 @@ def eye(N, M=None, k=0, dtype=float, maskna=False):
"""
if M is None:
M = N
- m = zeros((N, M), dtype=dtype, maskna=maskna)
+ m = zeros((N, M), dtype=dtype)
if k >= M:
return m
if k >= 0: