Merge remote-tracking branch 'upstream/master' into remove-numpy.distutils.compat

7 files changed, 5 insertions, 20 deletions

diff --git a/numpy/tests/test_ctypeslib.py b/numpy/tests/test_ctypeslib.py
index 521208c36..af3730df1 100644
--- a/numpy/tests/test_ctypeslib.py
+++ b/numpy/tests/test_ctypeslib.py
@@ -1,5 +1,3 @@
-from __future__ import division, absolute_import, print_function
-
 import sys
 import pytest
 import weakref
@@ -37,7 +35,7 @@ else:
                     reason="ctypes not available in this python")
 @pytest.mark.skipif(sys.platform == 'cygwin',
                     reason="Known to fail on cygwin")
-class TestLoadLibrary(object):
+class TestLoadLibrary:
     def test_basic(self):
         try:
             # Should succeed
@@ -63,7 +61,7 @@ class TestLoadLibrary(object):
             print(msg)
 
 
-class TestNdpointer(object):
+class TestNdpointer:
     def test_dtype(self):
         dt = np.intc
         p = ndpointer(dtype=dt)
@@ -130,7 +128,7 @@ class TestNdpointer(object):
 
 @pytest.mark.skipif(ctypes is None,
                     reason="ctypes not available on this python installation")
-class TestNdpointerCFunc(object):
+class TestNdpointerCFunc:
     def test_arguments(self):
         """ Test that arguments are coerced from arrays """
         c_forward_pointer.restype = ctypes.c_void_p
@@ -186,7 +184,7 @@ class TestNdpointerCFunc(object):
 
 @pytest.mark.skipif(ctypes is None,
                     reason="ctypes not available on this python installation")
-class TestAsArray(object):
+class TestAsArray:
     def test_array(self):
         from ctypes import c_int
 
@@ -277,7 +275,7 @@ class TestAsArray(object):
 
 @pytest.mark.skipif(ctypes is None,
                     reason="ctypes not available on this python installation")
-class TestAsCtypesType(object):
+class TestAsCtypesType:
     """ Test conversion from dtypes to ctypes types """
     def test_scalar(self):
         dt = np.dtype('<u2')
diff --git a/numpy/tests/test_matlib.py b/numpy/tests/test_matlib.py
index 38a7e39df..e04947a2e 100644
--- a/numpy/tests/test_matlib.py
+++ b/numpy/tests/test_matlib.py
@@ -1,5 +1,3 @@
-from __future__ import division, absolute_import, print_function
-
 # As we are testing matrices, we ignore its PendingDeprecationWarnings
 try:
     import pytest
diff --git a/numpy/tests/test_numpy_version.py b/numpy/tests/test_numpy_version.py
index 7fac8fd22..916ab9383 100644
--- a/numpy/tests/test_numpy_version.py
+++ b/numpy/tests/test_numpy_version.py
@@ -1,5 +1,3 @@
-from __future__ import division, absolute_import, print_function
-
 import re
 
 import numpy as np
diff --git a/numpy/tests/test_public_api.py b/numpy/tests/test_public_api.py
index 5f5ff8be0..48dd42a9f 100644
--- a/numpy/tests/test_public_api.py
+++ b/numpy/tests/test_public_api.py
@@ -1,5 +1,3 @@
-from __future__ import division, absolute_import, print_function
-
 import sys
 import subprocess
 import pkgutil
@@ -50,7 +48,6 @@ def test_numpy_namespace():
         'fastCopyAndTranspose': 'numpy.core._multiarray_umath._fastCopyAndTranspose',
         'get_array_wrap': 'numpy.lib.shape_base.get_array_wrap',
         'get_include': 'numpy.lib.utils.get_include',
-        'int_asbuffer': 'numpy.core._multiarray_umath.int_asbuffer',
         'mafromtxt': 'numpy.lib.npyio.mafromtxt',
         'ndfromtxt': 'numpy.lib.npyio.ndfromtxt',
         'recfromcsv': 'numpy.lib.npyio.recfromcsv',
diff --git a/numpy/tests/test_reloading.py b/numpy/tests/test_reloading.py
index e378d1463..2b5a324ba 100644
--- a/numpy/tests/test_reloading.py
+++ b/numpy/tests/test_reloading.py
@@ -1,5 +1,3 @@
-from __future__ import division, absolute_import, print_function
-
 import sys
 
 from numpy.testing import assert_raises, assert_, assert_equal
diff --git a/numpy/tests/test_scripts.py b/numpy/tests/test_scripts.py
index e42dc25f9..20447bcf3 100644
--- a/numpy/tests/test_scripts.py
+++ b/numpy/tests/test_scripts.py
@@ -2,8 +2,6 @@
 
 Test that we can run executable scripts that have been installed with numpy.
 """
-from __future__ import division, print_function, absolute_import
-
 import sys
 import os
 import pytest
diff --git a/numpy/tests/test_warnings.py b/numpy/tests/test_warnings.py
index f5560a099..48896f4b7 100644
--- a/numpy/tests/test_warnings.py
+++ b/numpy/tests/test_warnings.py
@@ -2,8 +2,6 @@
 Tests which scan for certain occurrences in the code, they may not find
 all of these occurrences but should catch almost all.
 """
-from __future__ import division, absolute_import, print_function
-
 import sys
 import pytest