Merge pull request #6046 from charris/pep8-and-pyflakes-cleanups

PEP8 and pyflakes fixups for numpy/ma/*.py and numpy/ma/tests/*.py

Merge cleanups prior to 1.10 release.

2 files changed, 11 insertions, 10 deletions

diff --git a/numpy/lib/tests/test_io.py b/numpy/lib/tests/test_io.py
index 8a939f85e..fbeb7fb0a 100644
--- a/numpy/lib/tests/test_io.py
+++ b/numpy/lib/tests/test_io.py
@@ -13,15 +13,17 @@ from datetime import datetime
 
 import numpy as np
 import numpy.ma as ma
-from numpy.lib._iotools import (ConverterError, ConverterLockError,
-                                ConversionWarning)
+from numpy.lib._iotools import (
+    ConverterError, ConverterLockError, ConversionWarning
+    )
 from numpy.compat import asbytes, bytes, unicode
 from nose import SkipTest
-from numpy.ma.testutils import (
-    TestCase, assert_equal, assert_array_equal, assert_allclose,
-    assert_raises, assert_raises_regex, run_module_suite
-)
-from numpy.testing import assert_warns, assert_, build_err_msg
+from numpy.ma.testutils import assert_equal, assert_almost_equal
+from numpy.testing import (
+    TestCase, run_module_suite, assert_warns, assert_, build_err_msg,
+    assert_raises_regex, assert_raises, assert_allclose,
+    assert_array_equal,
+    )
 from numpy.testing.utils import tempdir
 
 
diff --git a/numpy/lib/tests/test_recfunctions.py b/numpy/lib/tests/test_recfunctions.py
index 13e75cbd0..09cc29dc1 100644
--- a/numpy/lib/tests/test_recfunctions.py
+++ b/numpy/lib/tests/test_recfunctions.py
@@ -3,9 +3,8 @@ from __future__ import division, absolute_import, print_function
 import numpy as np
 import numpy.ma as ma
 from numpy.ma.mrecords import MaskedRecords
-from numpy.ma.testutils import (
-    run_module_suite, TestCase, assert_, assert_equal
-    )
+from numpy.ma.testutils import assert_equal
+from numpy.testing import TestCase, run_module_suite, assert_
 from numpy.lib.recfunctions import (
     drop_fields, rename_fields, get_fieldstructure, recursive_fill_fields,
     find_duplicates, merge_arrays, append_fields, stack_arrays, join_by