summaryrefslogtreecommitdiff
path: root/numpy/ma
diff options
context:
space:
mode:
authorSebastian Berg <sebastian@sipsolutions.net>2020-01-03 15:57:43 -0600
committerGitHub <noreply@github.com>2020-01-03 15:57:43 -0600
commitb7c27bd2a3817f59c84b004b87bba5db57d9a9b0 (patch)
treed1667015baca8a46ef286862368cc641a7cfe980 /numpy/ma
parente1aecb08f99321b72959cc50eb7b47454b613f52 (diff)
parented1e9659f103260a32536b4a7615393e3b1173dc (diff)
downloadnumpy-b7c27bd2a3817f59c84b004b87bba5db57d9a9b0.tar.gz
Merge pull request #14376 from jdufresne/future
MAINT: Remove unnecessary 'from __future__ import ...' statements
Diffstat (limited to 'numpy/ma')
-rw-r--r--numpy/ma/__init__.py2
-rw-r--r--numpy/ma/bench.py2
-rw-r--r--numpy/ma/core.py2
-rw-r--r--numpy/ma/extras.py2
-rw-r--r--numpy/ma/mrecords.py2
-rw-r--r--numpy/ma/setup.py2
-rw-r--r--numpy/ma/tests/test_core.py2
-rw-r--r--numpy/ma/tests/test_deprecations.py2
-rw-r--r--numpy/ma/tests/test_extras.py2
-rw-r--r--numpy/ma/tests/test_mrecords.py2
-rw-r--r--numpy/ma/tests/test_old_ma.py2
-rw-r--r--numpy/ma/tests/test_regression.py2
-rw-r--r--numpy/ma/tests/test_subclassing.py2
-rw-r--r--numpy/ma/testutils.py2
-rw-r--r--numpy/ma/timer_comparison.py2
15 files changed, 0 insertions, 30 deletions
diff --git a/numpy/ma/__init__.py b/numpy/ma/__init__.py
index 36ceb1f6e..870cc4ef2 100644
--- a/numpy/ma/__init__.py
+++ b/numpy/ma/__init__.py
@@ -39,8 +39,6 @@ may now proceed to calculate the mean of the other values:
.. moduleauthor:: Jarrod Millman
"""
-from __future__ import division, absolute_import, print_function
-
from . import core
from .core import *
diff --git a/numpy/ma/bench.py b/numpy/ma/bench.py
index a9ba42dea..a1363d4d9 100644
--- a/numpy/ma/bench.py
+++ b/numpy/ma/bench.py
@@ -1,8 +1,6 @@
#! /usr/bin/env python
# -*- coding: utf-8 -*-
-from __future__ import division, print_function
-
import timeit
import numpy
diff --git a/numpy/ma/core.py b/numpy/ma/core.py
index 2baf547a4..3fa0d63b3 100644
--- a/numpy/ma/core.py
+++ b/numpy/ma/core.py
@@ -20,8 +20,6 @@ Released for unlimited redistribution.
"""
# pylint: disable-msg=E1002
-from __future__ import division, absolute_import, print_function
-
import sys
import operator
import warnings
diff --git a/numpy/ma/extras.py b/numpy/ma/extras.py
index f4a914471..221e648c5 100644
--- a/numpy/ma/extras.py
+++ b/numpy/ma/extras.py
@@ -8,8 +8,6 @@ A collection of utilities for `numpy.ma`.
:version: $Id: extras.py 3473 2007-10-29 15:18:13Z jarrod.millman $
"""
-from __future__ import division, absolute_import, print_function
-
__all__ = [
'apply_along_axis', 'apply_over_axes', 'atleast_1d', 'atleast_2d',
'atleast_3d', 'average', 'clump_masked', 'clump_unmasked',
diff --git a/numpy/ma/mrecords.py b/numpy/ma/mrecords.py
index ae1a12c2c..83520d6b9 100644
--- a/numpy/ma/mrecords.py
+++ b/numpy/ma/mrecords.py
@@ -8,8 +8,6 @@ and the masking of individual fields.
.. moduleauthor:: Pierre Gerard-Marchant
"""
-from __future__ import division, absolute_import, print_function
-
# We should make sure that no field is called '_mask','mask','_fieldmask',
# or whatever restricted keywords. An idea would be to no bother in the
# first place, and then rename the invalid fields with a trailing
diff --git a/numpy/ma/setup.py b/numpy/ma/setup.py
index d1d6c89b5..af1e419b4 100644
--- a/numpy/ma/setup.py
+++ b/numpy/ma/setup.py
@@ -1,6 +1,4 @@
#!/usr/bin/env python
-from __future__ import division, print_function
-
def configuration(parent_package='',top_path=None):
from numpy.distutils.misc_util import Configuration
config = Configuration('ma', parent_package, top_path)
diff --git a/numpy/ma/tests/test_core.py b/numpy/ma/tests/test_core.py
index b72ce56aa..31f973e68 100644
--- a/numpy/ma/tests/test_core.py
+++ b/numpy/ma/tests/test_core.py
@@ -4,8 +4,6 @@
:author: Pierre Gerard-Marchant
:contact: pierregm_at_uga_dot_edu
"""
-from __future__ import division, absolute_import, print_function
-
__author__ = "Pierre GF Gerard-Marchant"
import sys
diff --git a/numpy/ma/tests/test_deprecations.py b/numpy/ma/tests/test_deprecations.py
index 72cc29aa0..7f44a2176 100644
--- a/numpy/ma/tests/test_deprecations.py
+++ b/numpy/ma/tests/test_deprecations.py
@@ -1,8 +1,6 @@
"""Test deprecation and future warnings.
"""
-from __future__ import division, absolute_import, print_function
-
import numpy as np
from numpy.testing import assert_warns
from numpy.ma.testutils import assert_equal
diff --git a/numpy/ma/tests/test_extras.py b/numpy/ma/tests/test_extras.py
index c75c47801..c36bcbbbb 100644
--- a/numpy/ma/tests/test_extras.py
+++ b/numpy/ma/tests/test_extras.py
@@ -7,8 +7,6 @@ Adapted from the original test_ma by Pierre Gerard-Marchant
:version: $Id: test_extras.py 3473 2007-10-29 15:18:13Z jarrod.millman $
"""
-from __future__ import division, absolute_import, print_function
-
import warnings
import itertools
import pytest
diff --git a/numpy/ma/tests/test_mrecords.py b/numpy/ma/tests/test_mrecords.py
index 94e772d55..14d39d949 100644
--- a/numpy/ma/tests/test_mrecords.py
+++ b/numpy/ma/tests/test_mrecords.py
@@ -5,8 +5,6 @@
:contact: pierregm_at_uga_dot_edu
"""
-from __future__ import division, absolute_import, print_function
-
import numpy as np
import numpy.ma as ma
from numpy import recarray
diff --git a/numpy/ma/tests/test_old_ma.py b/numpy/ma/tests/test_old_ma.py
index 7100eccbb..5d5046c09 100644
--- a/numpy/ma/tests/test_old_ma.py
+++ b/numpy/ma/tests/test_old_ma.py
@@ -1,5 +1,3 @@
-from __future__ import division, absolute_import, print_function
-
from functools import reduce
import numpy as np
diff --git a/numpy/ma/tests/test_regression.py b/numpy/ma/tests/test_regression.py
index b83873a5a..32e8e30c1 100644
--- a/numpy/ma/tests/test_regression.py
+++ b/numpy/ma/tests/test_regression.py
@@ -1,5 +1,3 @@
-from __future__ import division, absolute_import, print_function
-
import numpy as np
from numpy.testing import (
assert_, assert_array_equal, assert_allclose, suppress_warnings
diff --git a/numpy/ma/tests/test_subclassing.py b/numpy/ma/tests/test_subclassing.py
index 440b36722..781079371 100644
--- a/numpy/ma/tests/test_subclassing.py
+++ b/numpy/ma/tests/test_subclassing.py
@@ -6,8 +6,6 @@
:version: $Id: test_subclassing.py 3473 2007-10-29 15:18:13Z jarrod.millman $
"""
-from __future__ import division, absolute_import, print_function
-
import numpy as np
from numpy.testing import assert_, assert_raises
from numpy.ma.testutils import assert_equal
diff --git a/numpy/ma/testutils.py b/numpy/ma/testutils.py
index c0deaa9f4..51ab03948 100644
--- a/numpy/ma/testutils.py
+++ b/numpy/ma/testutils.py
@@ -5,8 +5,6 @@
:version: $Id: testutils.py 3529 2007-11-13 08:01:14Z jarrod.millman $
"""
-from __future__ import division, absolute_import, print_function
-
import operator
import numpy as np
diff --git a/numpy/ma/timer_comparison.py b/numpy/ma/timer_comparison.py
index 4ad635e38..fc63c18b5 100644
--- a/numpy/ma/timer_comparison.py
+++ b/numpy/ma/timer_comparison.py
@@ -1,5 +1,3 @@
-from __future__ import division, absolute_import, print_function
-
import timeit
from functools import reduce