Merge pull request #9452 from eric-wieser/new-style-classes
MAINT: Use new-style classes on 2.7
diff --git a/numpy/_globals.py b/numpy/_globals.py
index 64a84da..2d7b69b 100644
--- a/numpy/_globals.py
+++ b/numpy/_globals.py
@@ -53,7 +53,7 @@
pass
-class _NoValue:
+class _NoValue(object):
"""Special keyword value.
This class may be used as the default value assigned to a deprecated
diff --git a/numpy/core/code_generators/genapi.py b/numpy/core/code_generators/genapi.py
index e4651de..42c564a 100644
--- a/numpy/core/code_generators/genapi.py
+++ b/numpy/core/code_generators/genapi.py
@@ -72,7 +72,7 @@
return str.replace('Bool', 'npy_bool')
-class StealRef:
+class StealRef(object):
def __init__(self, arg):
self.arg = arg # counting from 1
@@ -83,7 +83,7 @@
return 'NPY_STEALS_REF_TO_ARG(%d)' % self.arg
-class NonNull:
+class NonNull(object):
def __init__(self, arg):
self.arg = arg # counting from 1
diff --git a/numpy/core/records.py b/numpy/core/records.py
index 69d997c..b6ff8bf 100644
--- a/numpy/core/records.py
+++ b/numpy/core/records.py
@@ -80,7 +80,7 @@
dup.append(list[i])
return dup
-class format_parser:
+class format_parser(object):
"""
Class to convert formats, names, titles description to a dtype.
diff --git a/numpy/f2py/auxfuncs.py b/numpy/f2py/auxfuncs.py
index d27b959..404bdbd 100644
--- a/numpy/f2py/auxfuncs.py
+++ b/numpy/f2py/auxfuncs.py
@@ -552,7 +552,7 @@
pass
-class throw_error:
+class throw_error(object):
def __init__(self, mess):
self.mess = mess
diff --git a/numpy/ma/core.py b/numpy/ma/core.py
index 09db76e..8cfbed6 100644
--- a/numpy/ma/core.py
+++ b/numpy/ma/core.py
@@ -784,7 +784,7 @@
ufunc_fills = {}
-class _DomainCheckInterval:
+class _DomainCheckInterval(object):
"""
Define a valid interval, so that :
@@ -809,7 +809,7 @@
umath.less(x, self.a))
-class _DomainTan:
+class _DomainTan(object):
"""
Define a valid interval for the `tan` function, so that:
@@ -827,7 +827,7 @@
return umath.less(umath.absolute(umath.cos(x)), self.eps)
-class _DomainSafeDivide:
+class _DomainSafeDivide(object):
"""
Define a domain for safe division.
@@ -848,7 +848,7 @@
return umath.absolute(a) * self.tolerance >= umath.absolute(b)
-class _DomainGreater:
+class _DomainGreater(object):
"""
DomainGreater(v)(x) is True where x <= v.
@@ -864,7 +864,7 @@
return umath.less_equal(x, self.critical_value)
-class _DomainGreaterEqual:
+class _DomainGreaterEqual(object):
"""
DomainGreaterEqual(v)(x) is True where x < v.
@@ -880,7 +880,7 @@
return umath.less(x, self.critical_value)
-class _MaskedUnaryOperation:
+class _MaskedUnaryOperation(object):
"""
Defines masked version of unary operations, where invalid values are
pre-masked.
@@ -959,7 +959,7 @@
return "Masked version of %s. [Invalid values are masked]" % str(self.f)
-class _MaskedBinaryOperation:
+class _MaskedBinaryOperation(object):
"""
Define masked version of binary operations, where invalid
values are pre-masked.
@@ -1111,7 +1111,7 @@
return "Masked version of " + str(self.f)
-class _DomainedBinaryOperation:
+class _DomainedBinaryOperation(object):
"""
Define binary operations that have a domain, like divide.
@@ -2358,7 +2358,7 @@
###############################################################################
-class _MaskedPrintOption:
+class _MaskedPrintOption(object):
"""
Handle the string used to represent missing data in a masked array.
@@ -6417,7 +6417,7 @@
##############################################################################
-class _frommethod:
+class _frommethod(object):
"""
Define functions from existing MaskedArray methods.
@@ -7895,7 +7895,7 @@
return masked_array(fxarray['_data'], mask=fxarray['_mask'])
-class _convert2ma:
+class _convert2ma(object):
"""
Convert functions from numpy to numpy.ma.
diff --git a/numpy/ma/extras.py b/numpy/ma/extras.py
index 0a68dfc..9084ae7 100644
--- a/numpy/ma/extras.py
+++ b/numpy/ma/extras.py
@@ -215,7 +215,7 @@
#####--------------------------------------------------------------------------
#---- --- Standard functions ---
#####--------------------------------------------------------------------------
-class _fromnxfunction:
+class _fromnxfunction(object):
"""
Defines a wrapper to adapt NumPy functions to masked arrays.
