Merge pull request #3241 from charris/2to3-apply-nonzero-fixer

2to3: Apply nonzero fixer.

2 files changed, 16 insertions, 1 deletions

diff --git a/numpy/oldnumeric/ma.py b/numpy/oldnumeric/ma.py
index 05a4480af..3b861709e 100644
--- a/numpy/oldnumeric/ma.py
+++ b/numpy/oldnumeric/ma.py
@@ -873,6 +873,18 @@ array(data = %(data)s,
         return bool(m is not nomask and m.any()
                     or d is not nomask and d.any())
 
+    def __bool__(self):
+        """returns true if any element is non-zero or masked
+
+        """
+        # XXX: This changes bool conversion logic from MA.
+        # XXX: In MA bool(a) == len(a) != 0, but in numpy
+        # XXX: scalars do not have len
+        m = self._mask
+        d = self._data
+        return bool(m is not nomask and m.any()
+                    or d is not nomask and d.any())
+
     def __len__ (self):
         """Return length of first dimension. This is weird but Python's
          slicing behavior depends on it."""
@@ -2142,10 +2154,13 @@ def asarray(data, dtype=None):
 # XXX: I is better to to change the masked_*_operation adaptors
 # XXX: to wrap ndarray methods directly to create ma.array methods.
 from types import MethodType
+
 def _m(f):
     return MethodType(f, None, array)
+
 def not_implemented(*args, **kwds):
     raise NotImplementedError("not yet implemented for numpy.ma arrays")
+
 array.all = _m(alltrue)
 array.any = _m(sometrue)
 array.argmax = _m(argmax)
diff --git a/tools/py3tool.py b/tools/py3tool.py
index 8b7c1b0a3..2a0c70e40 100755
--- a/tools/py3tool.py
+++ b/tools/py3tool.py
@@ -73,7 +73,7 @@ FIXES_TO_SKIP = [
     'methodattrs',
     'ne',
 #    'next',
-#    'nonzero',
+    'nonzero',
     'numliterals',
     'operator',
     'paren',