summaryrefslogtreecommitdiff
path: root/numpy/ma/tests/test_old_ma.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-04-21 19:46:02 -0700
committerCharles Harris <charlesr.harris@gmail.com>2013-04-21 19:46:02 -0700
commit56e806abb78ac03a5f45090a3b9bf7a6c9964026 (patch)
tree5c0106a65471d2c4bb85cd6b3dddf752d933fcf5 /numpy/ma/tests/test_old_ma.py
parent1975606394d577421c4b4e21abb8fdadbdc572c0 (diff)
parentc879ad8a39f2b74edcdaa05a2f2f854fb235537d (diff)
downloadnumpy-56e806abb78ac03a5f45090a3b9bf7a6c9964026.tar.gz
Merge pull request #3242 from charris/2to3-apply-types-fixer
2to3: Apply types fixer.
Diffstat (limited to 'numpy/ma/tests/test_old_ma.py')
-rw-r--r--numpy/ma/tests/test_old_ma.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/numpy/ma/tests/test_old_ma.py b/numpy/ma/tests/test_old_ma.py
index f5c9e426e..208086f7b 100644
--- a/numpy/ma/tests/test_old_ma.py
+++ b/numpy/ma/tests/test_old_ma.py
@@ -1,7 +1,6 @@
from __future__ import division, absolute_import, print_function
import sys
-import types
from functools import reduce
import numpy
@@ -166,7 +165,7 @@ class TestMa(TestCase):
if sys.version_info[0] >= 3:
self.assertTrue(isinstance(count(ott), numpy.integer))
else:
- self.assertTrue(isinstance(count(ott), types.IntType))
+ self.assertTrue(isinstance(count(ott), int))
self.assertEqual(3, count(ott))
self.assertEqual(1, count(1))
self.assertTrue (eq(0, array(1, mask=[1])))
@@ -175,7 +174,7 @@ class TestMa(TestCase):
if sys.version_info[0] >= 3:
assert_(isinstance(count(ott), numpy.integer))
else:
- assert_(isinstance(count(ott), types.IntType))
+ assert_(isinstance(count(ott), int))
self.assertTrue (eq(3, count(ott)))
assert_(getmask(count(ott, 0)) is nomask)
self.assertTrue (eq([1, 2], count(ott, 0)))